diff --git a/src/components/accounts/AccountSwitcher.jsx b/src/components/accounts/AccountSwitcher.jsx
index 8c9ef23..ea087aa 100644
--- a/src/components/accounts/AccountSwitcher.jsx
+++ b/src/components/accounts/AccountSwitcher.jsx
@@ -1,6 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 
 import classNames from 'classnames';
+import { Link } from 'react-router';
 import { FormattedMessage as Message } from 'react-intl';
 
 import { skins, SKIN_DARK, COLOR_WHITE } from 'components/ui';
@@ -112,7 +113,7 @@ export default class AccountSwitcher extends Component {
                     </div>
                 ))}
                 {allowAdd ? (
-                    <div>
+                    <Link to="/login">
                         <Button
                             color={COLOR_WHITE}
                             block
@@ -129,7 +130,7 @@ export default class AccountSwitcher extends Component {
                                 </Message>
                             }
                         />
-                    </div>
+                    </Link>
                 ) : null}
             </div>
         );
diff --git a/src/components/accounts/accountSwitcher.scss b/src/components/accounts/accountSwitcher.scss
index 71ac16e..b6b6c17 100644
--- a/src/components/accounts/accountSwitcher.scss
+++ b/src/components/accounts/accountSwitcher.scss
@@ -5,7 +5,7 @@
 //@import '~components/ui/panel.scss';
 $bodyLeftRightPadding: 20px;
 
-$lightBorderColor: #EEE;
+$lightBorderColor: #eee;
 
 .accountSwitcher {
     text-align: left;
@@ -16,12 +16,9 @@ $lightBorderColor: #EEE;
 }
 
 .accountUsername {
-    line-height: normal; // button style override
 }
 
 .accountEmail {
-    line-height: normal; // button style override
-    font-family: $font-family-base; // button style override
 }
 
 .lightAccountSwitcher {
@@ -68,7 +65,6 @@ $lightBorderColor: #EEE;
 
     .activeAccountUsername {
         font-size: 20px;
-        line-height: normal; // button style override
         color: $green;
     }
 
@@ -80,8 +76,7 @@ $lightBorderColor: #EEE;
     }
 
     .link {
-        line-height: normal; // button style override
-        font-size: 12px; // button style override
+        font-size: 12px;
         margin-bottom: 3px;
 
         &:last-of-type {
diff --git a/src/components/userbar/LoggedInPanel.jsx b/src/components/userbar/LoggedInPanel.jsx
index baade00..8849351 100644
--- a/src/components/userbar/LoggedInPanel.jsx
+++ b/src/components/userbar/LoggedInPanel.jsx
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
 
 import classNames from 'classnames';
 
@@ -15,16 +16,32 @@ export default class LoggedInPanel extends Component {
         user: userShape
     };
 
+    state = {
+        isAccountSwitcherActive: false
+    };
+
+    componentDidMount() {
+        document.addEventListener('click', this.onBodyClick);
+    }
+
+    componentWillUnmount() {
+        document.removeEventListener('click', this.onBodyClick);
+    }
+
     render() {
         const { user } = this.props;
+        const { isAccountSwitcherActive } = this.state;
 
         return (
             <div className={classNames(styles.loggedInPanel)}>
-                {/* this button must be a div, because some browsers force overflow hidden on button elements */}
-                <div className={classNames(buttons.green, styles.activeAccount)}>
-                    <span className={styles.userIcon} />
-                    <span className={styles.userName}>{user.username}</span>
-                    <span className={styles.expandIcon} />
+                <div className={classNames(styles.activeAccount, {
+                    [styles.activeAccountExpanded]: isAccountSwitcherActive
+                })}>
+                    <button className={buttons.green} onClick={this.onExpandAccountSwitcher}>
+                        <span className={styles.userIcon} />
+                        <span className={styles.userName}>{user.username}</span>
+                        <span className={styles.expandIcon} />
+                    </button>
 
                     <div className={classNames(styles.accountSwitcherContainer)}>
                         <AccountSwitcher skin="light" />
@@ -33,4 +50,51 @@ export default class LoggedInPanel extends Component {
             </div>
         );
     }
+
+    toggleAccountSwitcher() {
+        this.setState({
+            isAccountSwitcherActive: !this.state.isAccountSwitcherActive
+        });
+    }
+
+    onExpandAccountSwitcher = (event) => {
+        event.preventDefault();
+
+        this.toggleAccountSwitcher();
+    };
+
+    onBodyClick = createOnOutsideComponentClickHandler(
+        () => ReactDOM.findDOMNode(this),
+        () => this.state.isAccountSwitcherActive,
+        () => this.toggleAccountSwitcher()
+    );
+}
+
+/**
+ * Creates an event handling function to handle clicks outside the component
+ *
+ * The handler will check if current click was outside container el and if so
+ * and component isActive, it will call the callback
+ *
+ * @param  {function} getEl - the function, that returns reference to container el
+ * @param  {function} isActive - whether the component is active and callback may be called
+ * @param  {function} callback - the callback to call, when there was a click outside el
+ * @return {function}
+ */
+function createOnOutsideComponentClickHandler(getEl, isActive, callback) {
+    // TODO: we have the same logic in LangMenu
+    // Probably we should decouple this into some helper function
+    // TODO: the name of function may be better...
+    return (event) => {
+        if (isActive()) {
+            const el = getEl();
+
+            if (!el.contains(event.target) && el !== event.taget) {
+                event.preventDefault();
+
+                // add a small delay for the case someone have alredy called toggle
+                setTimeout(() => isActive() && callback(), 0);
+            }
+        }
+    };
 }
diff --git a/src/components/userbar/loggedInPanel.scss b/src/components/userbar/loggedInPanel.scss
index 54c00e6..f4b3771 100644
--- a/src/components/userbar/loggedInPanel.scss
+++ b/src/components/userbar/loggedInPanel.scss
@@ -5,15 +5,20 @@
 
 .activeAccount {
     position: relative;
+    display: inline-block;
 
     $border: 1px solid rgba(#fff, .15);
     border-left: $border;
     border-right: $border;
+}
 
-    &:hover {
-        .accountSwitcherContainer {
-            display: block;
-        }
+.activeAccountExpanded {
+    .accountSwitcherContainer {
+        display: block;
+    }
+
+    .expandIcon {
+        transform: rotate(180deg);
     }
 }