diff --git a/coffee/script.coffee b/coffee/script.coffee
index b0c664e..56c2627 100644
--- a/coffee/script.coffee
+++ b/coffee/script.coffee
@@ -13,6 +13,8 @@ class CloudKeys
         @fetchData()
         $('#newEntityLink').click =>
           @showForm()
+        $('#editEncPWLink').click =>
+          @showEditEncPWForm()
 
         $('#passwordRequest').addClass('hide')
 
diff --git a/templates/overview.html b/templates/overview.html
index 0373961..d51b047 100644
--- a/templates/overview.html
+++ b/templates/overview.html
@@ -25,6 +25,13 @@
             <li><a id="importLink">Import</a></li>
           </ul>
           <ul class="nav navbar-nav pull-right">
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Settings <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a id="editEncPWLink">Change Encryption Password</a></li>
+                <!-- TODO: <li><a id="editAccPWLink">Change Account Password</a></li> -->
+              </ul>
+            </li>
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Switch Account <b class="caret"></b></a>
                 <ul class="dropdown-menu">