diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 562428027..25f22f255 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -20,6 +20,7 @@
  - fixed: DataForm Integer value zero does not pass validation
  - added: Page range (start-finish) to available paginator text
  - rfe: view profile
+ - fixed: Show Message On Login continue link
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index 20ea3205e..3d71890cf 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -895,9 +895,11 @@ sub showMessageOnLogin {
     # Add the link to continue
     my $redirectUrl =  $self->session->form->get( 'returnUrl' )
                     || $self->session->scratch->get( 'redirectAfterLogin' )
-                    || $self->session->url->getSiteURL
+                    || $self->session->url->getSiteURL . $self->session->url->gateway()
                     ;
 
+    $self->session->log->warn('getSiteURL='.$self->session->url->getSiteURL);
+    $self->session->log->warn('scratch='.$self->session->scratch->get( 'redirectAfterLogin' ));
     $output     .= '<p><a href="' . $redirectUrl . '">' . $i18n->get( 'showMessageOnLogin return' ) 
                 .  '</a></p>'
                 ;