diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index e764e9b484835e4d3f3abe8e0305752f7c234c79..7d2bf84fc8dcf583730a5310c15967eb004268f1 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -57,6 +57,6 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:first_name, :last_name, :role, :language_id)
+    params.require(:user).permit(:first_name, :last_name, :role, :language_id, :picture, :picture_delete)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5eb31aafd3b47170a1f7fbf4ea417ff3a9b8e589..416495bf577fe735337a7587c084d0c6af292458 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,12 +45,15 @@
 class User < ApplicationRecord
   include WithDevise
 
+  # has_one_attached_resizable :picture
+  has_one_attached :picture
+
   belongs_to :university
   belongs_to :language
   has_one :researcher, class_name: 'Research::Researcher'
 
   def to_s
-    first_name || last_name ? "#{first_name} #{last_name}"
+    (first_name.present? || last_name.present?) ? "#{first_name} #{last_name}"
                             : "#{email}"
   end
 end
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index 0788369499f4698bf9023b3bf0d1953a976b5911..5bf94c0c8df4f5b717c2a3e17d560176638249e7 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -7,9 +7,10 @@
     </div>
     <div class="col-md-4">
       <%= f.input :first_name %>
+      <%= f.input :last_name %>
     </div>
     <div class="col-md-4">
-      <%= f.input :last_name %>
+      <%= f.input :picture %>
     </div>
   </div>
   <% content_for :buttons do %>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index 09a05a45772cfa796a55afcb01efafb4b96e748a..5f238acc4a8f893eee2125122ef7e4bf54590e40 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -27,6 +27,13 @@
   </p>
 <% end %>
 
+<% if @user.picture.attached? && @user.picture.variable? %>
+  <p>
+    <strong>Picture:</strong>
+    <%= image_tag @user.picture.variant(resize: '200x') %>
+  </p>
+<% end %>
+
 
 <% content_for :buttons do %>
   <%= edit_link @user %>