diff --git a/app/controllers/accounts.coffee b/app/controllers/accounts.coffee
index d778bd6d..90b871bd 100644
--- a/app/controllers/accounts.coffee
+++ b/app/controllers/accounts.coffee
@@ -7,4 +7,10 @@ Controller = Ember.ArrayController.extend
     @get('user.name') || @get('user.login')
   ).property('user.login', 'user.name')
 
+
+  actions: 
+    tokenVisibility: () ->
+      @toggleProperty('isVisible')
+      return false
+
 `export default Controller`
diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass
index f9a135d5..e3a183e5 100644
--- a/app/styles/app/layouts/profile.sass
+++ b/app/styles/app/layouts/profile.sass
@@ -100,7 +100,6 @@
   li
     margin: 1.5rem 0 2.5rem
   a
-    @extend %inline-block
     width: 100%
     &:hover
       h1, h2
diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index 3d465e92..71226e63 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -9,7 +9,14 @@
           <h1>{{userName}}</h1>
           <p>Repositories <strong>{{user.reposCount}}</strong></p>
         {{/link-to}}
-        <p class="profile-user-last">Token: <strong>{{auth.currentUser.token}}</strong></p>
+        <p class="profile-user-last">Token: 
+
+        {{#if isVisible}}
+          <strong>{{auth.currentUser.token}}</strong><a {{action 'tokenVisibility'}} class="profile-token-toggle">&lharu;</a>
+        {{else}}
+          <a {{action 'tokenVisibility'}} class="profile-token-toggle">&rharu;</a>
+        {{/if}}
+        </p>
       </div>
     </div>
   </section>