diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 12bdef14e..70f655dfb 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -76,7 +76,7 @@
 
     <!-- HELPERS -->
 
-    {% with version="2.1.1.1" %}
+    {% with version="2.1.2" %}
 
         <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">
 
diff --git a/static/userManagment/userManagment.js b/static/userManagment/userManagment.js
index 2e6b3d189..f706d487f 100644
--- a/static/userManagment/userManagment.js
+++ b/static/userManagment/userManagment.js
@@ -1494,6 +1494,8 @@ app.controller('listTableUsers', function ($scope, $http) {
 
     $scope.cyberpanelLoading = true;
 
+    var UserToDelete;
+
     $scope.populateCurrentRecords = function () {
         $scope.cyberpanelLoading = false;
 
@@ -1547,13 +1549,18 @@ app.controller('listTableUsers', function ($scope, $http) {
     $scope.populateCurrentRecords();
 
 
-    $scope.deleteUserFinal = function (name) {
+    $scope.deleteUserInitial = function (name){
+        UserToDelete = name;
+        $scope.UserToDelete = name;
+    };
+
+    $scope.deleteUserFinal = function () {
         $scope.cyberpanelLoading = false;
 
         var url = "/users/submitUserDeletion";
 
         var data = {
-            accountUsername: name,
+            accountUsername: UserToDelete,
         };
 
         var config = {
diff --git a/userManagment/static/userManagment/userManagment.js b/userManagment/static/userManagment/userManagment.js
index 2e6b3d189..f706d487f 100755
--- a/userManagment/static/userManagment/userManagment.js
+++ b/userManagment/static/userManagment/userManagment.js
@@ -1494,6 +1494,8 @@ app.controller('listTableUsers', function ($scope, $http) {
 
     $scope.cyberpanelLoading = true;
 
+    var UserToDelete;
+
     $scope.populateCurrentRecords = function () {
         $scope.cyberpanelLoading = false;
 
@@ -1547,13 +1549,18 @@ app.controller('listTableUsers', function ($scope, $http) {
     $scope.populateCurrentRecords();
 
 
-    $scope.deleteUserFinal = function (name) {
+    $scope.deleteUserInitial = function (name){
+        UserToDelete = name;
+        $scope.UserToDelete = name;
+    };
+
+    $scope.deleteUserFinal = function () {
         $scope.cyberpanelLoading = false;
 
         var url = "/users/submitUserDeletion";
 
         var data = {
-            accountUsername: name,
+            accountUsername: UserToDelete,
         };
 
         var config = {
diff --git a/userManagment/templates/userManagment/listUsers.html b/userManagment/templates/userManagment/listUsers.html
index 0d8c0a591..d617d73a9 100755
--- a/userManagment/templates/userManagment/listUsers.html
+++ b/userManagment/templates/userManagment/listUsers.html
@@ -51,18 +51,53 @@
                                     <td>
                                         <a ng-show="record.state=='ACTIVE'"
                                            class="btn btn-border btn-alt border-red btn-link font-red" href="#"
-                                           ng-click="controlUserState(record.name, 'SUSPEND')" title=""><span>{% trans 'Suspend' %}</span></a>
+                                           ng-click="controlUserState(record.name, 'SUSPEND')"
+                                           title=""><span>{% trans 'Suspend' %}</span></a>
                                         <a ng-show="record.state=='SUSPENDED'"
                                            class="btn btn-border btn-alt border-green btn-link font-green" href="#"
-                                           ng-click="controlUserState(record.name, 'ACTIVATE')" title=""><span>{% trans 'Activate' %}</span></a>
+                                           ng-click="controlUserState(record.name, 'ACTIVATE')"
+                                           title=""><span>{% trans 'Activate' %}</span></a>
                                         <a data-toggle="modal" data-target="#settings"
                                            ng-click="editInitial(record.name)"
                                            class="btn btn-border btn-alt border-purple btn-link font-purple" href="#"
                                            title=""><span>{% trans 'Edit' %}</span></a>
-                                        <a ng-click="deleteUserFinal(record.name)"
+                                        <a data-toggle="modal" data-target="#DeleteUserModal"
+                                           ng-click="deleteUserInitial(record.name)"
                                            class="btn btn-border btn-alt border-red btn-link font-red" href="#"
                                            title=""><span>{% trans 'Delete' %}</span></a>
 
+                                        <!--- Delete User Modal --->
+                                        <div id="DeleteUserModal" class="modal fade" role="dialog">
+                                            <div class="modal-dialog">
+
+                                                <!-- Modal content-->
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal">&times;
+                                                        </button>
+                                                        <h4 class="modal-title">Deleting user {$ UserToDelete $}
+                                                            <img ng-hide="cyberpanelLoading"
+                                                                 src="{% static 'images/loading.gif' %}">
+                                                        </h4>
+                                                    </div>
+                                                    <div class="modal-body">
+
+                                                        <p style="color: red; font-size: larger">This will delete all sites
+                                                            owned by this user and this
+                                                            process can not be reversed.</p>
+
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-default"
+                                                                data-dismiss="modal">Close
+                                                        </button>
+                                                        <button ng-click="deleteUserFinal()" type="button" class="btn btn-primary">Delete Now</button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <!--- Delete User Modal End--->
+
                                         <!--- Modal --->
                                         <div id="settings" class="modal fade" role="dialog">
                                             <div class="modal-dialog">