diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 67f78c42e..ea2ccddf4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -180,4 +180,8 @@ module ApplicationHelper
     @@youtube_title_cache[id] = ret;
     return ret
   end
+
+  def info_text(text)
+    "<span class='what_is_this' title='#{text}'>?</span>".html_safe
+  end
 end
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 963e2a7fd..6331458a6 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -3,8 +3,12 @@
 -#   the COPYRIGHT file.
 
 .span-24.last
-  %h2
+  %h2{:style => "position:relative;"}
     Home
+    .right
+      %span.description
+        = current_user.diaspora_handle
+        = info_text("This is your diaspora handle.  Like an email address, you can give this to people to reach you.")
 
 .span-15.last
   = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
@@ -16,7 +20,6 @@
   #pagination
     = will_paginate @posts
 
-
 .span-8.prepend-1.last
   = render 'shared/aspect_contacts', :contacts => @contacts, :aspect => @aspect
 
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 57984a55b..d5dea15a0 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -24,11 +24,24 @@
   %h2
     = t('account')
 
-  = link_to t('.invite_contacts'), new_user_invitation_path(current_user)
+  .span-8.append-1.last
+    %h3
+      Your diaspora handle
+    %p
+      %b= current_user.diaspora_handle
+  .span-8.prepend-2.last
+    %h3
+      Your email
+    %p
+      = current_user.email
 
   %br
   %br
   %br
+  %br
+  %br
+  %br
+  %br
 
   %h3 
     = t('.change_password')
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 41b943b58..f67dc0d7d 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -81,6 +81,7 @@ $(document).ready(function(){
   $(".add_aspect_button", "#aspect_nav").tipsy({gravity:'w'});
   $(".person img", ".dropzone").tipsy({live:true});
   $(".avatar", ".aspects").tipsy({live:true});
+  $(".what_is_this").tipsy({live:true,delayIn:400});
 
   $('.webfinger_form').submit(function(evt){
     form = $(evt.currentTarget);
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 6d2c1da45..4cc044cc5 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1943,3 +1943,26 @@ h3,h4
     :-moz-border-radius 5px
     :border-radius 5px
 
+.what_is_this
+  :display inline-block
+  :cursor default
+  :font
+    :size 8px
+  :color #fff
+
+  :background
+    :color #ccc
+
+  :-webkit-border-radius 10px
+
+  :width 15px
+  :max-width 12px
+  :text
+    :indent 4px
+
+  :position relative
+  :top -4px
+
+  &:hover
+    :background
+      :color #107FC9