diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index 213410901b..70c638388f 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -344,7 +344,7 @@ function displaySharedUsers(path) {
     users.forEach(function(user) {
 
       listName = document.createElement("li"),
-      spanAvatar = document.createElement("span"),
+      spanAvatar = undefined,
       spanName = document.createElement("span"),
       spanUid = document.createElement("span"),
       spanRemove = document.createElement("span"),
@@ -352,8 +352,16 @@ function displaySharedUsers(path) {
 
       listName.setAttribute('class', 'list-group-item text-left')
       listName.setAttribute('data-uid', user.uid)
-      spanAvatar.innerText = user.name.charAt(0)
-      spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+      if (user.image) {
+        spanAvatar = document.createElement("img")
+        spanAvatar.setAttribute('id', 'user-image')
+        spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+        spanAvatar.setAttribute('src', user.image)
+      } else {
+        spanAvatar = document.createElement("span")
+        spanAvatar.innerText = user.name.charAt(0)
+        spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+      }
       spanName.setAttribute('class', 'shared-user')
       spanName.innerText = user.name
       spanUid.setAttribute('class', 'text-muted ml-1')
diff --git a/app/controllers/concerns/joiner.rb b/app/controllers/concerns/joiner.rb
index f887ed43ec..3132eb0cc0 100644
--- a/app/controllers/concerns/joiner.rb
+++ b/app/controllers/concerns/joiner.rb
@@ -70,6 +70,7 @@ def join_room(opts)
       opts[:mute_on_start] = room_setting_with_config("muteOnStart")
 
       if current_user
+        opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
         redirect_to join_path(@room, current_user.name, opts, current_user.uid)
       else
         join_name = params[:join_name] || params[@room.invite_path][:join_name]
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index 934eab058d..ed21bcdcb6 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -181,6 +181,7 @@ def start
     opts[:mute_on_start] = room_setting_with_config("muteOnStart")
     opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval")
     opts[:record] = record_meeting
+    opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
 
     begin
       redirect_to join_path(@room, current_user.name, opts, current_user.uid)
diff --git a/app/views/rooms/cant_create_rooms.html.erb b/app/views/rooms/cant_create_rooms.html.erb
index 2d9f356ff8..cb661fa60f 100644
--- a/app/views/rooms/cant_create_rooms.html.erb
+++ b/app/views/rooms/cant_create_rooms.html.erb
@@ -20,11 +20,15 @@
                         <div class="card card-profile h-100">
                             <div class="card-header bg-primary h-50"></div>
                             <div class="card-body text-center">
-                              <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
-                              <h2 class="mb-3"><%= current_user.name %></h2>
-                              <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
-                                  <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
-                              <% end %>
+                                <% if current_user.image.blank? || !valid_url?(current_user.image) %>
+                                    <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
+                                <% else %>
+                                    <%= image_tag(current_user.image, class: "avatar avatar-xxxl card-profile-img") %>
+                                <% end %>
+                                <h2 class="mb-3"><%= current_user.name %></h2>
+                                <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
+                                    <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
+                                <% end %>
                             </div>
                         </div>
                     </div>
diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb
index 2482c4657a..a218e37a82 100644
--- a/app/views/rooms/components/_room_event.html.erb
+++ b/app/views/rooms/components/_room_event.html.erb
@@ -25,7 +25,11 @@
 
     <div class="row">
       <div class="col-lg-6 col-md-6 col-sm-12 mb-5">
-        <span class="avatar"><%= @room.owner.name.first %></span>
+        <% if @room.owner.image.blank? %>
+          <span class="avatar"><%= @room.owner.name.first %></span>
+        <% else %>
+          <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
+        <% end %>
         <h5 id="room-owner-name" class="font-weight-normal ml-4 mt-3 d-inline-block"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
       </div>
 
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 73d9de9c42..2ada39c2cf 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -40,7 +40,12 @@
 
           <div class="dropdown">
             <a href="#" class="nav-link pr-0" data-toggle="dropdown">
-              <span class="avatar"><%= current_user.name.first %></span>
+              <% if current_user.image.blank? || !valid_url?(current_user.image) %>
+                <span class="avatar"><%= current_user.name.first %></span>
+              <% else %>
+                <span id="user-avatar" class="avatar d-none"><%= current_user.name.first %></span>
+                <%= image_tag(current_user.image, id: "user-image", class: "avatar") %>
+              <% end %>
               <span class="ml-2 d-none d-lg-block">
                 <span class="text-default username"><%= current_user.name %></span>
               </span>
diff --git a/app/views/users/components/_account.html.erb b/app/views/users/components/_account.html.erb
index 77ad5eac1e..30a31bfa98 100644
--- a/app/views/users/components/_account.html.erb
+++ b/app/views/users/components/_account.html.erb
@@ -60,6 +60,20 @@
         <%= translated_role_name(@user.role) %>
       </span>
     <% end %>
+
+    <%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %>
+    <div class="row">
+      <div class="col-5 col-sm-2">
+        <% if @user.image.blank? || !valid_url?(@user.image) %>
+          <span class="avatar avatar-xxl mr-5 mt-2 bg-primary"><%= @user.name.first %></span>
+        <% else %>
+          <%= image_tag(@user.image, class: "avatar avatar-xxl mr-5 mt-2") %>
+        <% end %>
+      </div>
+      <div class="col-7 col-sm-10 mt-5">
+        <%= f.text_field :image, class: "form-control #{form_is_invalid?(@user, :image)}", placeholder: t("settings.account.image_url") %>
+      </div>
+    </div>
   </div>
   <div class="card-footer">
     <%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %>