diff --git a/packages/telescope-lib/package.js b/packages/telescope-lib/package.js
index 367a536ac..7e6441862 100644
--- a/packages/telescope-lib/package.js
+++ b/packages/telescope-lib/package.js
@@ -10,7 +10,8 @@ Package.onUse(function (api) {
   
   var packages = [
     'standard-app-packages',
-    'accounts-base',
+    'service-configuration',
+    'accounts-ui',
     'accounts-base',
     'accounts-password',
     'accounts-twitter',
diff --git a/packages/telescope-migrations/lib/server/migrations.js b/packages/telescope-migrations/lib/server/migrations.js
index 6d31fd433..ffc9e9993 100644
--- a/packages/telescope-migrations/lib/server/migrations.js
+++ b/packages/telescope-migrations/lib/server/migrations.js
@@ -596,6 +596,21 @@ var migrationsList = {
     }
     console.log("---------------------");
     return i;
+  },
+  migrateDisplayName: function () {
+    var i = 0;
+    var allUsers = Meteor.users.find({"telescope.displayName": {$exists: false}});
+    console.log('> Found '+allUsers.count()+' users.\n');
+
+    allUsers.forEach(function(user){
+      i++;
+
+      console.log('> Updating user '+user._id+' (' + user.username + ')');
+      var displayName = user.profile.name || user.profile.username;
+      console.log('name: ', displayName);
+      Meteor.users.update(user._id, {$set: {"telescope.displayName": displayName}});
+    });
+    return i;
   }
 };
 
diff --git a/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss b/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss
index 1efe7f833..176ea74af 100644
--- a/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss
+++ b/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss
@@ -52,4 +52,7 @@
   margin-top: 15px;
   padding-top: 15px;
   text-align: center;
+}
+.at-pwd-link{
+  margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/packages/telescope-users/lib/callbacks.js b/packages/telescope-users/lib/callbacks.js
index 80bbdbdf6..0ca4cbda3 100644
--- a/packages/telescope-users/lib/callbacks.js
+++ b/packages/telescope-users/lib/callbacks.js
@@ -28,8 +28,8 @@ function setupUser (user, options) {
     user.telescope.emailHash = Gravatar.hash(options.email);
   }
 
-  // set username on telescope
-  user.telescope.username = user.username;
+  // set displayName on telescope
+  user.telescope.displayName = user.username;
 
   // create slug from username
   user.telescope.slug = Telescope.utils.slugify(user.telescope.username);
diff --git a/packages/telescope-users/lib/client/templates/dashboard/users-dashboard.js b/packages/telescope-users/lib/client/templates/dashboard/users-dashboard.js
index 07a7136b3..dcada2dca 100644
--- a/packages/telescope-users/lib/client/templates/dashboard/users-dashboard.js
+++ b/packages/telescope-users/lib/client/templates/dashboard/users-dashboard.js
@@ -6,16 +6,16 @@ Template.usersDashboard.helpers({
       showFilter: true,
       fields: [
         { key: 'avatar', label: '', tmpl: Template.users_list_avatar, sortable: false },
-        { key: 'username', label: 'Username', tmpl: Template.users_list_username },
-        { key: 'profile.username', label: 'Display Name' },
-        { key: 'profile.email', label: 'Email', tmpl: Template.users_list_email },
         { key: 'createdAt', label: 'Member Since', tmpl: Template.users_list_created_at, sort: 'descending' },
-        { key: 'postCount', label: 'Posts' },
-        { key: 'commentCount', label: 'Comments' },
-        { key: 'karma', label: 'Karma', fn: function(val){return Math.round(100*val)/100} },
-        { key: 'inviteCount', label: 'Invites' },
-        { key: 'isInvited', label: 'Invited', fn: function(val){return val ? 'Yes':'No'} },
         { key: 'isAdmin', label: 'Admin', fn: function(val){return val ? 'Yes':'No'} },
+        { key: 'username', label: 'Username', tmpl: Template.users_list_username },
+        { key: 'telescope.displayName', label: 'Display Name' },
+        { key: 'telescope.email', label: 'Email', tmpl: Template.users_list_email },
+        { key: 'telescope.postCount', label: 'Posts' },
+        { key: 'telescope.commentCount', label: 'Comments' },
+        { key: 'telescope.karma', label: 'Karma', fn: function(val){return Math.round(100*val)/100} },
+        { key: 'telescope.inviteCount', label: 'Invites' },
+        { key: 'telescope.isInvited', label: 'Invited', fn: function(val){return val ? 'Yes':'No'} },
         { key: 'actions', label: 'Actions', tmpl: Template.users_list_actions, sortable: false }
       ]
     };
diff --git a/packages/telescope-users/lib/client/templates/dashboard/users_list_email.html b/packages/telescope-users/lib/client/templates/dashboard/users_list_email.html
index 302097c4f..bba8d1e44 100644
--- a/packages/telescope-users/lib/client/templates/dashboard/users_list_email.html
+++ b/packages/telescope-users/lib/client/templates/dashboard/users_list_email.html
@@ -1,3 +1,3 @@
 <template name="users_list_email">
-  <a href="mailto:{{profile.email}}">{{profile.email}}</a>
+  <a href="mailto:{{telescope.email}}">{{telescope.email}}</a>
 </template>
diff --git a/packages/telescope-users/lib/users.js b/packages/telescope-users/lib/users.js
index f15a04f27..ee3419a7d 100644
--- a/packages/telescope-users/lib/users.js
+++ b/packages/telescope-users/lib/users.js
@@ -34,9 +34,8 @@ Telescope.schemas.userData = new SimpleSchema({
     type: Number,
     optional: true
   },
-  displayName: {
+  displayName: { // can contain spaces and special characters, doesn't need to be unique
     type: String,
-    regEx: /^[a-zA-Z-]{2,25}$/,
     optional: true,
     editableBy: ["member", "admin"]
   },