diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 542b1b69b..722de0607 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -263,7 +263,7 @@ define([
                         password = val;
                     }), parsed.getUrl());
                 }).nThen(function (w) {
-                    if (!password && sessionStorage.newPadPassword) {
+                    if (!password && !stored && sessionStorage.newPadPassword) {
                         password = sessionStorage.newPadPassword;
                         delete sessionStorage.newPadPassword;
                     }