diff --git a/views/account/account.jade b/views/account/account.jade
index 2612dfe818..48641cdc3f 100644
--- a/views/account/account.jade
+++ b/views/account/account.jade
@@ -293,23 +293,7 @@ block content
                         a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/auth/twitter')
                             i.fa.fa-twitter
                             | Link Twitter with your account
-            br
-    - if (ch[0] > 0)
-        .panel.panel-primary
-            .panel-heading.text-center Completed Challenges:
-            .panel-body
-                .col-xs-12
-                  table.table.table-striped
-                    thead
-                      tr
-                        th Challenge
-                        th Date Finished
-                    for challenge in challenges
-                      if ch[challenge.challengeNumber] > 0
-                        tr
-                          td= challenges[challenge.challengeNumber].name
-                          td= moment(ch[challenge.challengeNumber], 'X').format("MMM DD, YYYY")
-            br
+
     .panel.panel-danger
         .panel-heading.text-center Danger Zone:
         .panel-body
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index 8388ea2ba6..a8f9f3ce20 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -37,8 +37,16 @@
                 a(href='/account') [ #{user.points} ]
             .hidden-xs
                 if user.profile.picture
-                    a(href='/account')
-                        img.profile-picture.float-right(src='#{user.profile.picture}')
+                    if (user.profile.username)
+                        a(href='/' + user.profile.username)
+                            img.profile-picture.float-right(src='#{user.profile.picture}')
+                    else
+                        a(href='/account')
+                            img.profile-picture.float-right(src='#{user.profile.picture}')
                 else
-                    a(href='/account')
-                        img.profile-picture.float-right(src='#{user.gravatar(60)}')
\ No newline at end of file
+                    if (user.profile.username)
+                        a(href='/' + user.profile.username)
+                            img.profile-picture.float-right(src='#{user.gravatar(60)}')
+                    else
+                        a(href='/account')
+                            img.profile-picture.float-right(src='#{user.gravatar(60)}')
\ No newline at end of file