diff --git a/blocks/ORB/Userbar.pm b/blocks/ORB/Userbar.pm
index 5c16ed9..900843c 100644
--- a/blocks/ORB/Userbar.pm
+++ b/blocks/ORB/Userbar.pm
@@ -54,7 +54,7 @@ sub block_display {
                                                 forcessl => 1),
                  "signout" => $self -> build_url(block => "login",
                                                 fullurl  => 1,
-                                                pathinfo => [ "logout" ],
+                                                pathinfo => [ "signout" ],
                                                 params   => {},
                                                 forcessl => 1),
                  "signup"  => $self -> build_url(block => "login",
@@ -62,6 +62,11 @@ sub block_display {
                                                  pathinfo => [ "signup" ],
                                                  params   => {},
                                                  forcessl => 1),
+                 "setpass" => $self -> build_url(block => "login",
+                                                 fullurl  => 1,
+                                                 pathinfo => [ "passchange" ],
+                                                 params   => {},
+                                                 forcessl => 1),
                  "front"   => $self -> build_url(block    => $self -> {"settings"} -> {"config"} -> {"default_block"},
                                                  fullurl  => 1,
                                                  pathinfo => [],
@@ -81,6 +86,7 @@ sub block_display {
                                                                 "%(username)s"    => $user -> {"username"},
                                                                 "%(gravhash)s"    => $user -> {"gravatar_hash"},
                                                                 "%(url-signout)s" => $urls -> {"signout"},
+                                                                "%(url-setpass)s" => $urls -> {"setpass"},
                                                               });
 
     } else {
diff --git a/templates/default/css/foundation.mods.css b/templates/default/css/foundation.mods.css
index f26c736..5a56526 100755
--- a/templates/default/css/foundation.mods.css
+++ b/templates/default/css/foundation.mods.css
@@ -21,3 +21,12 @@ div.top-bar-title {
     padding-top: 0.5rem;
     font-weight: bold;
 }
+
+/* fix padding for menu text with image */
+li.image {
+    padding: 0 0 0 0.25rem;
+}
+
+.menu > li > a.nopadding {
+    padding: 0;
+}
diff --git a/templates/default/userbar/profile_signedin.tem b/templates/default/userbar/profile_signedin.tem
new file mode 100644
index 0000000..e0133c8
--- /dev/null
+++ b/templates/default/userbar/profile_signedin.tem
@@ -0,0 +1,9 @@
+                        <ul class="dropdown menu" data-dropdown-menu>
+                            <li class="image is-dropdown-submenu-parent"><a href="#" class="nopadding"><img alt="" src="https://gravatar.com/avatar/%(gravhash)s?s=32&amp;d=mm&amp;r=g" class="avatar avatar-32" height="32" width="32" /> %(realname)s</a>
+                                <ul class="menu">
+                                    <li><a href="%(url-setpass)s">Set Password</a></li>
+                                    <!-- ... -->
+                                </ul>
+                            </li>
+                            <li><a class="button failure" href="%(url-signout)s">Sign out</a></li>
+                        </ul>
\ No newline at end of file