diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index c6297624c..d3feef475 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -27,45 +27,8 @@
         </div>
       </div>
     <% end %>
+
+    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path %>
+
   </div>
 </div>
-<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path %>
-
-<h2><%= t("devise_views.registrations.edit.edit") %> user</h2>
-
-<%= form_for(@account, as: "user", url: registration_path(@account), html: { method: :put }) do |f| %>
-
-  <div class="field">
-    <%= f.label :email, t("devise_views.registrations.edit.email_label") %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
-
-  <% if devise_mapping.confirmable? && @resource.pending_reconfirmation? %>
-    <div><%= t("devise_views.registrations.edit.waiting_for") %> <%= @resource.unconfirmed_email %></div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :password, t("devise_views.registrations.edit.password_label") %> <i><%= t("devise_views.registrations.edit.leave_blank") %></i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password_confirmation, t("devise_views.registrations.edit.password_confirmation_label") %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :current_password, t("devise_views.registrations.edit.current_password_label") %> <i><%= t("devise_views.registrations.edit.need_current") %></i><br />
-    <%= f.password_field :current_password, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit t("devise_views.registrations.edit.update_submit") %>
-  </div>
-<% end %>
-
-<h3><%= t("devise_views.registrations.edit.cancel_title") %></h3>
-
-<p><%= t("devise_views.registrations.edit.cancel_text") %> <%= button_to t("devise_views.registrations.edit.cancel_link"), registration_path(user), data: { confirm: t("devise_views.registrations.edit.cancel_confirm") }, method: :delete %></p>
-
-<%= link_to t("devise_views.registrations.edit.back_link"), :back %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index d359cf5cd..3216c927b 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,39 +1,41 @@
-<h2><%= t("devise_views.registrations.edit.edit") %> <%= resource_name.to_s.humanize %></h2>
+<div class="row account">
+  <div class="small-12 medium-9 column">
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
+    <h1><%= t("devise_views.registrations.edit.edit") %> <%= resource_name.to_s.humanize %></h1>
+
+    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+      <%= devise_error_messages! %>
+
+      <div class="field">
+        <%= f.label :email, t("devise_views.registrations.edit.email_label") %><br />
+        <%= f.email_field :email, autofocus: true %>
+      </div>
+
+      <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+        <div><%= t("devise_views.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
+      <% end %>
+
+      <div class="field">
+        <%= f.label :password, t("devise_views.registrations.edit.password_label") %> <i><%= t("devise_views.registrations.edit.leave_blank") %></i><br />
+        <%= f.password_field :password, autocomplete: "off" %>
+      </div>
+
+      <div class="field">
+        <%= f.label :password_confirmation, t("devise_views.registrations.edit.password_confirmation_label") %><br />
+        <%= f.password_field :password_confirmation, autocomplete: "off" %>
+      </div>
+
+      <div class="field">
+        <%= f.label :current_password, t("devise_views.registrations.edit.current_password_label") %> <i><%= t("devise_views.registrations.edit.need_current") %></i><br />
+        <%= f.password_field :current_password, autocomplete: "off" %>
+      </div>
+
+      <div class="actions">
+        <%= f.submit t("devise_views.registrations.edit.update_submit") %>
+      </div>
+    <% end %>
+
+    <%= link_to t("devise_views.registrations.edit.back_link"), :back %>
 
-  <div class="field">
-    <%= f.label :email, t("devise_views.registrations.edit.email_label") %><br />
-    <%= f.email_field :email, autofocus: true %>
   </div>
-
-  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <div><%= t("devise_views.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :password, t("devise_views.registrations.edit.password_label") %> <i><%= t("devise_views.registrations.edit.leave_blank") %></i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password_confirmation, t("devise_views.registrations.edit.password_confirmation_label") %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :current_password, t("devise_views.registrations.edit.current_password_label") %> <i><%= t("devise_views.registrations.edit.need_current") %></i><br />
-    <%= f.password_field :current_password, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit t("devise_views.registrations.edit.update_submit") %>
-  </div>
-<% end %>
-
-<h3><%= t("devise_views.registrations.edit.cancel_title") %></h3>
-
-<p><%= t("devise_views.registrations.edit.cancel_text") %> <%= button_to t("devise_views.registrations.edit.cancel_link"), registration_path(resource_name), data: { confirm: t("devise_views.registrations.edit.cancel_confirm") }, method: :delete %></p>
-
-<%= link_to t("devise_views.registrations.edit.back_link"), :back %>
+</div>
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9bbdde6b6..2a1289cf5 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -62,7 +62,7 @@ es:
     show:
       title: "Mi cuenta"
       save_changes_submit: "Guardar cambios"
-      change_credentials_link: "Cambiar mi contraseña"
+      change_credentials_link: "Cambiar mis credenciales"
       first_name_label: "Nombre"
       last_name_label: "Apellidos"
       use_nickname_label: "Usar pseudónimo"