diff --git a/web/client/actions/security.js b/web/client/actions/security.js
index 0d0ac9493c..689a7339be 100644
--- a/web/client/actions/security.js
+++ b/web/client/actions/security.js
@@ -51,9 +51,9 @@ function logout(redirectUrl) {
     };
 }
 
-function logoutWithReload(redirectUrl) {
+function logoutWithReload() {
     return (dispatch) => {
-        dispatch(logout(redirectUrl));
+        dispatch(logout(null));
         dispatch(loadMaps(false, ConfigUtils.getDefaults().initialMapFilter || "*"));
     };
 }
diff --git a/web/client/plugins/drawer/Menu.jsx b/web/client/plugins/drawer/Menu.jsx
index 2e86091919..cac1f0a5ec 100644
--- a/web/client/plugins/drawer/Menu.jsx
+++ b/web/client/plugins/drawer/Menu.jsx
@@ -60,7 +60,7 @@ var Menu = React.createClass({
     },
     renderButtons() {
         return this.props.children.map((child) => {
-            const button = (<Button key={child.props.eventKey} bsSize="large" className={(child.props.buttonConfig && child.props.buttonConfig.buttonClassName) ? child.props.buttonConfig.buttonClassName : "square-button"} onClick={this.props.onChoose.bind(null, child.props.eventKey)} bsStyle={this.props.activeKey === child.props.eventKey ? 'default' : 'primary'}>
+            const button = (<Button key={child.props.eventKey} bsSize="large" className={(child.props.buttonConfig && child.props.buttonConfig.buttonClassName) ? child.props.buttonConfig.buttonClassName : "square-button"} onClick={this.props.onChoose.bind(null, child.props.eventKey, this.props.activeKey === child.props.eventKey)} bsStyle={this.props.activeKey === child.props.eventKey ? 'default' : 'primary'}>
                         {child.props.glyph ? <Glyphicon glyph={child.props.glyph} /> : child.props.icon}
                     </Button>);
             if (child.props.buttonConfig.tooltip) {
diff --git a/web/client/plugins/login/index.js b/web/client/plugins/login/index.js
index 3211aff9d1..4abc65e9c3 100644
--- a/web/client/plugins/login/index.js
+++ b/web/client/plugins/login/index.js
@@ -13,7 +13,7 @@ const {Glyphicon} = require('react-bootstrap');
 
 const closeLogin = () => {
     return (dispatch) => {
-        dispatch(setControlProperty('LoginForm', 'enabled', false));
+        dispatch(setControlProperty(null, 'LoginForm', 'enabled', false, false));
         dispatch(resetError());
     };
 };
@@ -21,9 +21,9 @@ const closeLogin = () => {
 const UserMenu = connect((state) => ({
     user: state.security && state.security.user
 }), {
-    onShowLogin: setControlProperty.bind(null, "LoginForm", "enabled", true),
-    onShowAccountInfo: setControlProperty.bind(null, "AccountInfo", "enabled", true),
-    onShowChangePassword: setControlProperty.bind(null, "ResetPassword", "enabled", true),
+    onShowLogin: setControlProperty.bind(null, "LoginForm", "enabled", true, true),
+    onShowAccountInfo: setControlProperty.bind(null, "AccountInfo", "enabled", true, true),
+    onShowChangePassword: setControlProperty.bind(null, "ResetPassword", "enabled", true, true),
     onLogout: logoutWithReload
 })(require('../../components/security/UserMenu'));
 
@@ -31,7 +31,7 @@ const UserDetails = connect((state) => ({
     user: state.security && state.security.user,
     show: state.controls.AccountInfo && state.controls.AccountInfo.enabled}
 ), {
-    onClose: setControlProperty.bind(null, "AccountInfo", "enabled", false)
+    onClose: setControlProperty.bind(null, "AccountInfo", "enabled", false, false)
 })(require('../../components/security/modals/UserDetailsModal'));
 
 const PasswordReset = connect((state) => ({
@@ -39,7 +39,7 @@ const PasswordReset = connect((state) => ({
     show: state.controls.ResetPassword && state.controls.ResetPassword.enabled
 }), {
     onPasswordChange: (user, pass) => { return geoStoreChangePassword(user, pass); },
-    onClose: setControlProperty.bind(null, "ResetPassword", "enabled", false)
+    onClose: setControlProperty.bind(null, "ResetPassword", "enabled", false, false)
 })(require('../../components/security/modals/PasswordResetModal'));
 
 const Login = connect((state) => ({
@@ -47,7 +47,7 @@ const Login = connect((state) => ({
     user: state.security && state.security.user,
     loginError: state.security && state.security.loginError
 }), {
-    onLoginSuccess: setControlProperty.bind(null, 'LoginForm', 'enabled', false),
+    onLoginSuccess: setControlProperty.bind(null, 'LoginForm', 'enabled', false, false),
     onClose: closeLogin,
     onSubmit: geoStoreLoginSubmit,
     onError: loginFail
@@ -61,9 +61,9 @@ const LoginNav = connect((state) => ({
     bsStyle: "primary",
     className: "square-button"
 }), {
-    onShowLogin: setControlProperty.bind(null, "LoginForm", "enabled", true),
-    onShowAccountInfo: setControlProperty.bind(null, "AccountInfo", "enabled", true),
-    onShowChangePassword: setControlProperty.bind(null, "ResetPassword", "enabled", true),
+    onShowLogin: setControlProperty.bind(null, "LoginForm", "enabled", true, true),
+    onShowAccountInfo: setControlProperty.bind(null, "AccountInfo", "enabled", true, true),
+    onShowChangePassword: setControlProperty.bind(null, "ResetPassword", "enabled", true, true),
     onLogout: logoutWithReload
 })(require('../../components/security/UserMenu'));