diff --git a/html-templates/designs/site-bootstrap4.tpl b/html-templates/designs/site-bootstrap4.tpl
index ab1b6445..f36c8fbc 100644
--- a/html-templates/designs/site-bootstrap4.tpl
+++ b/html-templates/designs/site-bootstrap4.tpl
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+{load_templates designs/site.subtemplates.tpl}
 <html lang="en">
 
 <head>
@@ -70,16 +71,27 @@
                         <ul class="dropdown-menu search" id="navbarSearchBarDropdown" aria-labelledby="navbarDropdown">
                         </ul>
                     </li>
-                    <li class="nav-item show">
-                        <a class="nav-link " href="/login?return=%2F" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
-                            Login
-                        </a>
-                    </li>
-                    <li class="nav-item show">
-                        <a class="nav-link " href="/register?return=%2F" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
-                            Signup
-                        </a>
-                    </li>
+                    {if $.User}
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                {avatar $.User 18} {$.User->FirstName}
+                            </a>
+                            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                                {include includes/site-bootstrap4.nav-userlinks.tpl}
+                            </div>
+                        </li>
+                    {else}
+                        <li class="nav-item show">
+                            <a class="nav-link" href="/login?return={$.server.REQUEST_URI|escape:url}" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
+                                {_ "Login"}
+                            </a>
+                        </li>
+                        <li class="nav-item show">
+                            <a class="nav-link" href="/register?return={$.server.REQUEST_URI|escape:url}" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
+                                {_ "Signup"}
+                            </a>
+                        </li>
+                    {/if}
                 </ul>
             </div>
         </div>
diff --git a/html-templates/includes/site-bootstrap4.nav-userlinks.tpl b/html-templates/includes/site-bootstrap4.nav-userlinks.tpl
new file mode 100644
index 00000000..d86f0adc
--- /dev/null
+++ b/html-templates/includes/site-bootstrap4.nav-userlinks.tpl
@@ -0,0 +1,3 @@
+<a class="dropdown-item nav-link" href="{$.User->getURL()}">{_ "View My Profile"}</a>
+<a class="dropdown-item nav-link" href="/profile">{_ "Edit My Profile"}</a>
+<a class="dropdown-item nav-link" href="/logout">{_ "Logout"}</a>
