diff --git a/components/quickConnect/QuickConnectDialog.bs b/components/quickConnect/QuickConnectDialog.bs
index 97990ce97..5676c3ef2 100644
--- a/components/quickConnect/QuickConnectDialog.bs
+++ b/components/quickConnect/QuickConnectDialog.bs
@@ -33,7 +33,7 @@ sub OnAuthenticated()
         authenticated = AuthenticateViaQuickConnect(m.top.quickConnectJson.secret)
         if authenticated <> invalid and authenticated = true
             currentUser = AboutMe()
-            session.user.Login(currentUser)
+            session.user.Login(currentUser, m.top.saveCredentials)
             session.user.LoadUserPreferences()
             LoadUserAbilities()
             m.top.close = true
diff --git a/components/quickConnect/QuickConnectDialog.xml b/components/quickConnect/QuickConnectDialog.xml
index 22a43bc03..3e360d5e6 100644
--- a/components/quickConnect/QuickConnectDialog.xml
+++ b/components/quickConnect/QuickConnectDialog.xml
@@ -7,5 +7,6 @@
     <interface>
         <field id="quickConnectJson" type="assocarray" />
         <field id="authenticated" type="boolean" alwaysNotify="true" />
+        <field id="saveCredentials" type="boolean" />
     </interface>
 </component>
\ No newline at end of file
diff --git a/source/ShowScenes.bs b/source/ShowScenes.bs
index 79c41a197..dca7b2b28 100644
--- a/source/ShowScenes.bs
+++ b/source/ShowScenes.bs
@@ -506,6 +506,7 @@ function CreateSigninGroup(user = "")
                 else
                     ' Server user is talking to is at least 10.8 and has quick connect enabled...
                     m.quickConnectDialog = createObject("roSGNode", "QuickConnectDialog")
+                    m.quickConnectDialog.saveCredentials = checkbox.checkedState[0]
                     m.quickConnectDialog.quickConnectJson = json
                     m.quickConnectDialog.title = tr("Quick Connect")
                     m.quickConnectDialog.message = [tr("Here is your Quick Connect code: ") + json.Code, tr("(Dialog will close automatically)")]