diff --git a/umap/templates/umap/login_popup_end.html b/umap/templates/umap/login_popup_end.html
index cc8fd95d..459d5547 100644
--- a/umap/templates/umap/login_popup_end.html
+++ b/umap/templates/umap/login_popup_end.html
@@ -1,12 +1,15 @@
 {% load i18n %}
-<h3>{% trans "You are logged in. Continuing..." %} ({% trans "if this window/tab does not close, you can close it, you are authenticated anyway." %})</h3>
+<h3>{% trans "You are logged in. Continuing..." %}</h3>
 
 <script type="text/javascript">
 
     function proceed()
     {
-        if (window.opener) {
+        if (window.opener && window.opener.umap_proceed) {
             window.opener.umap_proceed();
+        } else {
+            // Trade off as Twitter does not allow us to access window.opener
+            window.location.href = '{% url "user_maps" request.user.username %}'
         }
     }