diff --git a/models/User.js b/models/User.js
index 6d7d67c65d..3f68208f5e 100644
--- a/models/User.js
+++ b/models/User.js
@@ -18,7 +18,7 @@ var userSchema = new mongoose.Schema({
     gender: { type: String, default: '' },
     location: { type: String, default: '' },
     website: { type: String, default: '' },
-    picture: { type: String, default: 'http://bit.ly/1cppDAL' }
+    picture: { type: String, default: '' }
   }
 });
 
@@ -30,7 +30,7 @@ userSchema.path('password').validate(function(password) {
 userSchema.path('username').validate(function(username) {
   if (this.provider) return true;
   return username.length;
-}, 'Username cannot be blank');
+}, 'Email cannot be blank');
 
 
 userSchema.pre('save', function(next) {
diff --git a/public/css/styles.less b/public/css/styles.less
index a80ab85ec2..62735a55c6 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -4,15 +4,17 @@ body {
 //
 // TODO: Refactor
 //
-.user img {
-  border-radius: 50%;
+
+.user .picture {
   width: 40px;
   height: 40px;
-  vertical-align: baseline;
-  margin-top: -15px;
-  margin-bottom: -15px;
-  position: relative;
-  left: -10px;
+  margin: -10px 0 -10px 0;
+  border-radius: 50%;
+  background-color: #1a242f;
+
+  img {
+    max-height: 100%;
+  }
 }
 
 [class^="fa-"],
diff --git a/views/layout.jade b/views/layout.jade
index 8c9ce42dc7..dcd9e295a4 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -47,7 +47,8 @@ html
             else
               li.user(class=title=='Account Management'?'active':undefined)
                 a(href='/account')
-                  img(src='#{user.profile.picture}')
+                  if user.profile.picture
+                    img(src='#{user.profile.picture}')
                   | #{user.profile.name}
               li
                 a(href='/logout') Logout