diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 16db3bb6b..8a0eee4c6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fixed #11891: Shop credit not displayed in payment method screen
  - fixed #11871: Metadata display and criteria builder problems
  - fixed #10189: pbworkflow000000000007 Hanging
+ - fixed #11897: Continue to the site link loses current page
 
 7.10.1
  - fixed #11851: Story Topic: top story variables should be available all the time
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 1f7dde4d8..25f6e89cd 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -9,9 +9,16 @@ save you many hours of grief.
 
 7.10.2
 --------------------------------------------------------------------
+     * The URL used by Display Message on Login always returns the user to 
+       the page where they logged in.  If your site depended on the old,
+       buggy behavior of returning the user to the home page after showing
+       a message, then in the Settings you can assign Redirect After Login Url
+       to /.
+
      * The UKPLayer - a slideshow that displays images as a movie - 
        is in WebGUI again. Licencing information was overlooked. An 
        upgrade to 7.10.1 will break the Matrix. This is fixed now.
+
 7.10.1
 --------------------------------------------------------------------
      * WebGUI now depends on PerlIO::eol, for doing line ending translation.
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index 04f9b5541..6243d8b39 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -1066,10 +1066,13 @@ sub showMessageOnLogin {
     WebGUI::Macro::process( $self->session, \$output );
 
     # Add the link to continue
+    my $session = $self->session;
+    $session->log->warn("returnUrl: >".$self->session->form->get( 'returnUrl' )."<");
+    $session->log->warn("redirectAfterLoginUrl: >".$self->session->form->get( 'returnUrl' )."<");
     my $redirectUrl =  $self->session->form->get( 'returnUrl' )
                     || $self->session->setting->get("redirectAfterLoginUrl")
                     || $self->session->scratch->get( 'redirectAfterLogin' )
-                    || $self->session->url->getSiteURL . $self->session->url->gateway()
+                    || $self->session->url->getBackToSiteURL
                     ;
 
     $output     .= '<p><a href="' . $redirectUrl . '">' . $i18n->get( 'showMessageOnLogin return' )