diff --git a/web/app/assets/javascripts/accounts_profile.js b/web/app/assets/javascripts/accounts_profile.js
index 85491c39c..615bdf708 100644
--- a/web/app/assets/javascripts/accounts_profile.js
+++ b/web/app/assets/javascripts/accounts_profile.js
@@ -36,6 +36,7 @@
                 city: userDetail.city,
                 first_name: userDetail.first_name,
                 last_name: userDetail.last_name,
+                photoUrl: context.JK.resolveAvatarUrl(userDetail.photo_url),
                 user_instruments: userDetail.instruments,
                 birth_date : userDetail.birth_date,
                 gender: userDetail.gender,
diff --git a/web/app/assets/stylesheets/client/account.css.scss b/web/app/assets/stylesheets/client/account.css.scss
index 93967f182..c6410266f 100644
--- a/web/app/assets/stylesheets/client/account.css.scss
+++ b/web/app/assets/stylesheets/client/account.css.scss
@@ -59,7 +59,15 @@
   }
 
   .account-profile {
-    padding-top:25px;
+    padding-top:20px;
+
+    .avatar_large {
+      position:absolute;
+      float:none;
+      top: -36px;
+      right:0;
+      margin-right:20%;
+    }
 
     h2 {
       margin-bottom:15px;
@@ -67,17 +75,16 @@
 
     .location {
       position:relative;
+      padding-top:25px;
     }
 
     #account-change-avatar {
-      position:absolute;
-      top:-27px;
-      right:72px;
       height:13px;
+      float:right;
+      margin-right:17%;
     }
 
     .birth_date {
-      margin-left:40px;
     }
   }
 
diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb
index e301ae4e5..982493710 100644
--- a/web/app/views/clients/_account_profile.html.erb
+++ b/web/app/views/clients/_account_profile.html.erb
@@ -30,7 +30,9 @@
        <h2>profile:</h2>
 
       <div class="location w30 left">
+        <a href="#" class="avatar_large"><img src="{photoUrl}" id="profile-avatar" /></a>
         <a href="#" class="small" id="account-change-avatar">Change Avatar</a>
+        <div class="clearall"></div>
 
         <div class="field">
           <label>Country:</label>
@@ -54,19 +56,19 @@
         </div>
       </div>
 
-      <div class="right-side right w70">
+      <div class="right-side right w70" style="margin-top:-36px;">
         <div class="field left w45">
           <label>First Name:</label>
-          <input type="text" name="first_name" value="{first_name}" class="w80"><br/>
+          <input type="text" name="first_name" value="{first_name}" class="w80" style="margin-bottom:12px;">
         </div>
         <div class="field right w45">
           <label>Last Name:</label>
-          <input type="text" name="last_name" value="{last_name}" class="w80">
+          <input type="text" name="last_name" value="{last_name}" class="w80" style="margin-bottom:12px;">
         </div>
 
         <br class="clearall"/>
 
-        <div class="field left">
+        <div class="field left w45">
           <label>Gender:</label>
           <select name="gender" data-value="{gender}" class="w80">
             <option value='M'>Male</option>
@@ -75,7 +77,7 @@
           </select>
         </div>
 
-        <div class="field left birth_date">
+        <div class="field right w45 birth_date">
           <label>Birth Date:</label>
           <%= date_select("user", "birth_date", :use_short_month => true, :start_year => 1900, :end_year => Time.now.year - 18, :order => [:month, :day, :year], :default => -25.years.from_now) %>
         </div>
@@ -100,9 +102,9 @@
           <a id="account-edit-profile-cancel" href="#" class="button-grey">CANCEL</a>&nbsp;&nbsp;<a id="account-edit-profile-submit" href="#" class="button-orange">UPDATE PROFILE</a>
         </div>
       </div>
-    </form>
 
-    <br clear="all"/>
+      <div class="clearall"/>
+    </form>
 
   </div>
   <!-- end content wrapper -->