diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m
index ff08857525..0eb2d8f828 100644
--- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m
+++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m
@@ -309,6 +309,23 @@ - (UIBarButtonItem *)createSettingsButton {
         }
     }]];
     
+    
+    if ([[SalesforceSDKManager sharedManager] isDevSupportEnabled]) {
+        [menuActions addObject:[UIAction actionWithTitle:[SFSDKResourceUtils localizedString:@"LOGIN_OPTIONS"]
+                                                   image:nil
+                                              identifier:nil
+                                                 handler:^(__kindof UIAction* _Nonnull action) {
+            UIViewController *configPicker = [BootConfigPickerViewController makeViewControllerOnConfigurationCompleted:^{
+                [self dismissViewControllerAnimated:YES completion:^{
+                    if ([self.delegate respondsToSelector:@selector(loginViewControllerDidReload:)]) {
+                        [self.delegate loginViewControllerDidReload:self];
+                    }
+                }];
+            }];
+            [self presentViewController:configPicker animated:YES completion:nil];
+        }]];
+    }
+    
     UIMenu *menu = [UIMenu menuWithTitle:@"" // No title
                                 children:menuActions];
     UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc] initWithImage:image menu:menu];
diff --git a/shared/resources/SalesforceSDKResources.bundle/en.lproj/Localizable.strings b/shared/resources/SalesforceSDKResources.bundle/en.lproj/Localizable.strings
index 6b48fe4c4f..d8cd7c6a0d 100644
--- a/shared/resources/SalesforceSDKResources.bundle/en.lproj/Localizable.strings
+++ b/shared/resources/SalesforceSDKResources.bundle/en.lproj/Localizable.strings
@@ -67,6 +67,7 @@
 "LOGIN_SERVER_NAME_PLACEHOLDER" = "Optional";
 "DONE_BUTTON" = "Done";
 "LOGIN_SETTINGS_BUTTON" = "Settings";
+"LOGIN_OPTIONS" = "Login Options";
 
 "LOGIN_CLEAR_COOKIES" = "Clear Cookies";
 "LOGIN_CLEAR_CACHE" = "Clear Cache";