diff --git a/app/views/settings/_data.haml b/app/views/settings/_data.haml
index 98b80195..929800ab 100644
--- a/app/views/settings/_data.haml
+++ b/app/views/settings/_data.haml
@@ -13,31 +13,31 @@
 
         %p.font-weight-bold.mb-0 Display name
         %p.text-muted
-          - if current_user.display_name.blank?
+          - if current_user.profile.display_name.blank?
             None set!
           - else
-            = current_user.display_name
+            = current_user.profile.display_name
 
         %p.font-weight-bold.mb-0 Bio
         %p.text-muted
-          - if current_user.bio.blank?
+          - if current_user.profile.description.blank?
             None set!
           - else
-            = current_user.bio
+            = current_user.profile.description
 
         %p.font-weight-bold.mb-0 Location
         %p.text-muted
-          - if current_user.location.blank?
+          - if current_user.profile.location.blank?
             None set!
           - else
-            = current_user.location
+            = current_user.profile.location
 
         %p.font-weight-bold.mb-0 Website
         %p.text-muted
-          - if current_user.website.blank?
+          - if current_user.profile.website.blank?
             None set!
           - else
-            = current_user.website
+            = current_user.profile.website
       .col-md-6.col-sm-6.col-xs-12
         %h4 Pictures
         %p.font-weight-bold.mb-0 Profile picture
diff --git a/app/views/user/_profile.haml b/app/views/user/_profile.haml
index 235fe788..8511cc56 100644
--- a/app/views/user/_profile.haml
+++ b/app/views/user/_profile.haml
@@ -24,15 +24,15 @@
           %span.badge.badge-success
             %i.fa.fa-fw.fa-users
             = t 'views.user.title.moderator'
-    - unless user.bio.blank?
+    - unless user.profile.description.blank?
       .profile__biography
-        = markdown user.bio
-    - unless user.website.blank?
+        = markdown user.profile.description
+    - unless user.profile.website.blank?
       .profile__website
         %i.fa.fa-fw.fa-globe
-        %a{ href: user.website }= user.display_website
-    - unless user.location.blank?
+        %a{ href: user.profile.website }= user.profile.display_website
+    - unless user.profile.location.blank?
       .profile__location
         %i.fa.fa-fw.fa-location-arrow
-        = user.location
+        = user.profile.location
     = render 'user/actions', user: user, type: :follower