diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index fa626ece9..494068476 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -17,7 +17,7 @@ class AccountController < ApplicationController
     end
 
     def account_params
-      params.require(:account).permit(:first_name, :last_name)
+      params.require(:account).permit(:first_name, :last_name, :nickname, :use_nickname)
     end
 
 end
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index b3d45d967..da568a9b9 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,11 +1,20 @@
 <h1><%= t("account.show.title") %></h1>
 
 <%= form_for @account, as: :account, url: account_path do |f| %>
+
   <%= f.label :first_name, t("account.show.first_name_label") %>
   <%= f.text_field :first_name %>
   <%= f.label :last_name, t("account.show.last_name_label") %>
   <%= f.text_field :last_name %>
 
+  <div>
+  <%= f.check_box :use_nickname %>
+  <%= t("account.show.use_nickname_label") %>
+  </div>
+
+  <%= f.label :nickname, t("account.show.nickname_label") %>
+  <%= f.text_field :nickname %>
+
   <%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
 <% end %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4907f14c0..f1496837b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,6 +60,8 @@ en:
       change_credentials_link: "Change my credentials"
       first_name_label: "First Name"
       last_name_label: "Last Name"
+      use_nickname_label: "Use nickname"
+      nickname_label: "Nickname"
   recaptcha:
     errors:
       verification_failed: "The captcha verification failed"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f9f41995e..995d92fb8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -60,6 +60,8 @@ es:
       change_credentials_link: "Cambiar mi contraseña"
       first_name_label: "Nombre"
       last_name_label: "Apellidos"
+      use_nickname_label: "Usar pseudónimo"
+      nickname_label: "Pseudónimo"
   recaptcha:
     errors:
       verification_failed: "La verificación por captcha falló"