diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index fd24c7f..13a20d9 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -44,7 +44,8 @@
 	<script type="text/javascript" src="{% static 'js/alertify.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/jscookie.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/jPages.js' %}"></script>
-    <script type="text/javascript" src="{% static "js/d3.min.js" %}"></script>
+    <script type="text/javascript" src="{% static 'js/d3.min.js' %}"></script>
+		<script type="text/javascript" src="{% static 'subjects/js/modal_subject.js' %}"></script>
 
   	<!-- Font awesome -->
 	<link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
@@ -151,7 +152,7 @@
                             <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                             <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
                             <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
-                            <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
+                            <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
                             <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
                         </ul>
                     </li>
@@ -306,6 +307,9 @@
 
           });
         </script>
+				<div id="remove_acc">
+
+				</div>
 </body>
 
 </html>
diff --git a/users/templates/users/delete.html b/users/templates/users/delete.html
index f0d2b60..065a15f 100644
--- a/users/templates/users/delete.html
+++ b/users/templates/users/delete.html
@@ -1,36 +1,23 @@
-{% extends 'users/list.html' %}
+{% load static i18n permission_tags %}
 
-{% load static i18n %}
-{% load widget_tweaks %}
-{% load django_bootstrap_breadcrumbs %}
-
-{% block breadcrumbs %}
-    {{ block.super }}
-    {% trans 'Delete User' as bread %}
-    {% breadcrumb bread 'users:delete' %}
-{% endblock %}
-
-{% block content %}
-    <div class="row">
-        <div class="col-md-12">
-            <div class="well well-lg">
-                <form action="" method="post">
-                    {% csrf_token %}
-                    <h2>{% trans 'Are you sure you want delete the user' %}: {{ acc }}?</h2>
-                    <p>{% trans 'All data will be lost and havent how recover it.' %}</p>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="pull-left">
-                                <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
-                            </div>
-                            <div class="pull-right">
-                                <a href="{% url 'users:manage' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="users" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+           <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+        <form id="delete_form" action="{% url 'users:delete' email %}" method="post">
+          {% csrf_token %}
+          <p>{% trans 'Are you sure you want delete the user' %}: {{ acc }}?</p>
+        </form>
+      </div>
+      <!-- Modal Footer -->
+      <div id="delete-category-footer"class="modal-footer">
+        <!-- Don't remove that!!!  -->
+        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="submit" form="delete_form" class="btn btn-success btn-raised erase-button">{% trans "Delete" %}</button>
+      </div>
     </div>
-    <br clear="all" />
-{% endblock %}
+  </div>
+</div>
diff --git a/users/templates/users/delete_account.html b/users/templates/users/delete_account.html
index 65cc9d3..0df5bb9 100644
--- a/users/templates/users/delete_account.html
+++ b/users/templates/users/delete_account.html
@@ -1,36 +1,23 @@
-{% extends 'users/profile.html' %}
+{% load static i18n permission_tags %}
 
-{% load static i18n %}
-{% load widget_tweaks %}
-{% load django_bootstrap_breadcrumbs %}
-
-{% block breadcrumbs %}
-    {{ block.super }}
-    {% trans 'Remove Account' as bread %}
-    {% breadcrumb bread 'users:remove_acc' %}
-{% endblock %}
-
-{% block content %}
-    <div class="row">
-        <div class="col-md-12">
-            <div class="well well-lg">
-                <form action="" method="post">
-                    {% csrf_token %}
-                    <h2>{% trans 'Are you sure you want delete your account?' %}</h2>
-                    <p>{% trans 'All data will be lost and havent how recover it.' %}</p>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="pull-left">
-                                <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
-                            </div>
-                            <div class="pull-right">
-                                <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="remove_account" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+           <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+        <form id="delete_form" action="{% url 'users:remove_acc' %}" method="post">
+          {% csrf_token %}
+          <p>{% trans 'Are you sure you want delete your account?' %}</p>
+        </form>
+      </div>
+      <!-- Modal Footer -->
+      <div id="delete-category-footer" class="modal-footer">
+        <!-- Don't remove that!!!  -->
+        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="submit" form="delete_form" class="btn btn-success btn-raised erase-button">{% trans "Delete" %}</button>
+      </div>
     </div>
-    <br clear="all" />
-{% endblock %}
+  </div>
+</div>
diff --git a/users/templates/users/list.html b/users/templates/users/list.html
index e2a2b52..28cab42 100644
--- a/users/templates/users/list.html
+++ b/users/templates/users/list.html
@@ -54,7 +54,7 @@
                     <div class="col-md-6">
                         <p><b>{% trans 'Name' %}:</b> {{ acc }}</p>
                         <p><b>{% trans 'Email' %}:</b> {{ acc.email }}</p>
-                        <p><b>{% trans 'Description' %}:</b> 
+                        <p><b>{% trans 'Description' %}:</b>
                             {% autoescape off %}
                                 {{ acc.description|default:_("Not Informed")|striptags|truncatechars:300 }}
                             {% endautoescape %}
@@ -63,7 +63,7 @@
                     <div class="col-md-3">
                         <div align="right">
                             <a href="{% url 'users:update' acc.email %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
-                            <a href="{% url 'users:delete' acc.email %}" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
+                            <a href="javascript:delete_subject.get('{% url 'users:delete' acc.email %}','#users','#modal_remove')" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
                         </div>
                     </div>
                 </div>
@@ -77,4 +77,7 @@
             </div>
         </div>
     {% endif %}
+    <div id="modal_remove">
+
+    </div>
 {% endblock %}
diff --git a/users/views.py b/users/views.py
index ae6c866..20146c5 100644
--- a/users/views.py
+++ b/users/views.py
@@ -247,6 +247,7 @@ class DeleteView(braces_mixins.LoginRequiredMixin, LogMixin, generic.DeleteView)
 	def get_context_data(self, **kwargs):
 		context = super(DeleteView, self).get_context_data(**kwargs)
 		context['title'] = _('Delete Account')
+		context['email'] = self.kwargs.get('email', None)
 
 		return context
 
--
libgit2 0.21.2