3 files changed, 46 insertions, 9 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 23eb9da4b..16d5b2ebd 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -3,7 +3,7 @@
 <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user %>
 
-    <% if not flash[:error] %>
+    <% if not flash[:error] and not @post_redirect.reason_params[:user_name] %>
     <h2>If you've used GovernmentSpy before</h2>
     <% end %>
 
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
index 97cb88a89..32d1bd5f5 100644
--- a/app/views/user/sign.rhtml
+++ b/app/views/user/sign.rhtml
@@ -1,14 +1,43 @@
-<% @title = "Sign in or make a new account" %>
+<% if @post_redirect.reason_params[:user_name] %>
+    <% @title = "Sign in" %>
 
-<div id="sign_together">
+    <div id="sign_alone">
 
-<p id="sign_in_reason">
-<%= @post_redirect.reason_params[:web] %>
-</p>
+        <p id="sign_in_reason">
+        <% if @post_redirect.reason_params[:web].empty? %>
+            Please sign in as <%= link_to h(@post_redirect.reason_params[:user_name]), @post_redirect.reason_params[:user_url] %>.
+        <% else %>
+            <%= @post_redirect.reason_params[:web] %>, 
+            please sign in as <%= link_to h(@post_redirect.reason_params[:user_name]), @post_redirect.reason_params[:user_url] %>.
+        <% end %>
+        </p>
 
-<%= render :partial => 'signin' %>
+    <%= render :partial => 'signin' %>
 
-<%= render :partial => 'signup' %>
+    </div>
+
+<% else %>
+    <% @title = "Sign in or make a new account" %>
+
+    <div id="sign_together">
+
+        <p id="sign_in_reason">
+        <% if @post_redirect.reason_params[:web].empty? %>
+            Please sign in or make a new account.
+        <% else %>
+            <%= @post_redirect.reason_params[:web] %>, please sign in or make a new account.
+        <% end %>
+        </p>
+
+        <%= render :partial => 'signin' %>
+        <%= render :partial => 'signup' %>
+
+    </div>
+
+<% end %>
+
+<% if @post_redirect.reason_params[:user_name] %>
+<% else %>
+<% end %>
 
-</div>
 
diff --git a/app/views/user/wrong_user.rhtml b/app/views/user/wrong_user.rhtml
new file mode 100644
index 000000000..cb8eb8eac
--- /dev/null
+++ b/app/views/user/wrong_user.rhtml
@@ -0,0 +1,8 @@
+
+<p id="sign_in_reason">
+<%= @reason_params[:web] %>, please 
+<%= link_to "sign out", signout_url(:r => request.request_uri) %>, 
+and sign in as <%= h(@reason_params[:user_name]) %>.
+</p>
+
+