diff --git a/shell/packages/sandstorm-accounts-ui/login_buttons.js b/shell/packages/sandstorm-accounts-ui/login_buttons.js
index 34e43e0370..9ec85a8b19 100644
--- a/shell/packages/sandstorm-accounts-ui/login_buttons.js
+++ b/shell/packages/sandstorm-accounts-ui/login_buttons.js
@@ -69,7 +69,10 @@ var loginResultCallback = function (serviceName, err) {
   } else if (err instanceof Accounts.LoginCancelledError) {
     // do nothing
   } else if (err instanceof ServiceConfiguration.ConfigError) {
-    Router.go("adminSettings");
+    loginButtonsSession.errorMessage(
+      "Configuration problem: " + err.message + ". Please visit the Admin Settings page within " +
+      "Sandstorm, or ask your administrator to do so. You may need an admin token. Read more by " +
+      "clicking Troubleshooting below.");
   } else {
     loginButtonsSession.errorMessage(err.reason || "Unknown error");
   }
@@ -206,6 +209,7 @@ Template.oauthLoginButton.events({
 
     var loginWithService = Meteor[instance.data.data.method];
 
+    var serviceName = instance.data.data.displayName;
     loginWithService({}, function (err) {
       loginResultCallback(serviceName, err);
     });