diff --git a/src/component-index.js b/src/component-index.js
index 4bf0b0f984..cdab24a40e 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -66,6 +66,8 @@ import views$globals$MatrixToolbar from './components/views/globals/MatrixToolba
 views$globals$MatrixToolbar && (module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar);
 import views$globals$NewVersionBar from './components/views/globals/NewVersionBar';
 views$globals$NewVersionBar && (module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar);
+import views$globals$PasswordNagBar from './components/views/globals/PasswordNagBar';
+views$globals$PasswordNagBar && (module.exports.components['views.globals.PasswordNagBar'] = views$globals$PasswordNagBar);
 import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog';
 views$login$VectorCustomServerDialog && (module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog);
 import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter';
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
new file mode 100644
index 0000000000..11168403dc
--- /dev/null
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -0,0 +1,52 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+import React from 'react';
+import sdk from 'matrix-react-sdk';
+import Modal from 'matrix-react-sdk/lib/Modal';
+
+export default React.createClass({
+    onUpdateClicked: function() {
+        // TODO: Implement dialog to set password
+        // const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
+        // Modal.createDialog(SetPasswordDialog, {
+        //     onFinished: () => {
+        //     }
+        // });
+    },
+
+    render: function() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return (
+            <div className="mx_MatrixToolbar">
+                <img className="mx_MatrixToolbar_warning"
+                    src="img/warning.svg"
+                    width="24"
+                    height="23"
+                    alt="Warning"
+                />
+                <div className="mx_MatrixToolbar_content">
+                    To be able to return to your account, you need to set a password.
+                </div>
+                <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>
+                    Set Password
+                </button>
+            </div>
+        );
+    }
+});