diff --git a/app/scripts/controllers/accounting/AccViewGLAccountContoller.js b/app/scripts/controllers/accounting/AccViewGLAccountContoller.js
index 535f130c..e64a92b2 100644
--- a/app/scripts/controllers/accounting/AccViewGLAccountContoller.js
+++ b/app/scripts/controllers/accounting/AccViewGLAccountContoller.js
@@ -55,9 +55,9 @@
             var GlAccDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.accountCoaResource.delete({glAccountId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/accounting_coa');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/accounting/ViewAccRuleController.js b/app/scripts/controllers/accounting/ViewAccRuleController.js
index 65072bab..059c46ab 100644
--- a/app/scripts/controllers/accounting/ViewAccRuleController.js
+++ b/app/scripts/controllers/accounting/ViewAccRuleController.js
@@ -14,9 +14,9 @@
             var AccRuleDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.accountingRulesResource.delete({accountingRuleId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/accounting_rules');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/accounting/ViewAccountingClosureController.js b/app/scripts/controllers/accounting/ViewAccountingClosureController.js
index 05174eda..8cf8066f 100644
--- a/app/scripts/controllers/accounting/ViewAccountingClosureController.js
+++ b/app/scripts/controllers/accounting/ViewAccountingClosureController.js
@@ -15,9 +15,9 @@
             var AccDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.accountingClosureResource.delete({accId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/accounts_closure');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/accounting/ViewTransactionController.js b/app/scripts/controllers/accounting/ViewTransactionController.js
index a4feb2a9..1022a7c1 100644
--- a/app/scripts/controllers/accounting/ViewTransactionController.js
+++ b/app/scripts/controllers/accounting/ViewTransactionController.js
@@ -27,8 +27,8 @@
             var ConfirmationCtrl = function ($scope, $modalInstance, id) {
                 $scope.transactionnumber = id.transactionId;
                 $scope.redirect = function () {
-                    location.path('/viewtransactions/' + id.transactionId);
                     $modalInstance.close('delete');
+                    location.path('/viewtransactions/' + id.transactionId);
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/centers/ViewCenterController.js b/app/scripts/controllers/centers/ViewCenterController.js
index e1124ae2..c921bae5 100644
--- a/app/scripts/controllers/centers/ViewCenterController.js
+++ b/app/scripts/controllers/centers/ViewCenterController.js
@@ -38,9 +38,9 @@
             var CenterDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.centerResource.delete({centerId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('activate');
                         location.path('/centers');
                     });
-                    $modalInstance.close('activate');
 
                 };
                 $scope.cancel = function () {
@@ -50,9 +50,9 @@
             var CenterUnassignCtrl = function ($scope, $modalInstance) {
                 $scope.unassign = function () {
                     resourceFactory.groupResource.save({groupId: routeParams.id, command: 'unassignStaff'}, scope.staffData, function (data) {
+                        $modalInstance.close('activate');
                         route.reload();
                     });
-                    $modalInstance.close('activate');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/client/ViewClientController.js b/app/scripts/controllers/client/ViewClientController.js
index 6b219807..2e83dc56 100644
--- a/app/scripts/controllers/client/ViewClientController.js
+++ b/app/scripts/controllers/client/ViewClientController.js
@@ -85,10 +85,10 @@
                                 if (!scope.$$phase) {
                                     scope.$apply();
                                 }
+                                $modalInstance.close('upload');
                                 route.reload();
                             });
                     }
-                    $modalInstance.close('upload');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -103,9 +103,9 @@
             var ClientDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.clientResource.delete({clientId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/clients');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -114,9 +114,9 @@
             var ClientUnassignCtrl = function ($scope, $modalInstance) {
                 $scope.unassign = function () {
                     resourceFactory.clientResource.save({clientId: routeParams.id, command: 'unassignstaff'}, scope.staffData, function (data) {
+                        $modalInstance.close('unassign');
                         route.reload();
                     });
-                    $modalInstance.close('unassign');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/groups/ViewGroupController.js b/app/scripts/controllers/groups/ViewGroupController.js
index 50fe6336..4712b3f2 100644
--- a/app/scripts/controllers/groups/ViewGroupController.js
+++ b/app/scripts/controllers/groups/ViewGroupController.js
@@ -51,9 +51,9 @@
             var GroupUnassignCtrl = function ($scope, $modalInstance) {
                 $scope.unassign = function () {
                     resourceFactory.groupResource.save({groupId: routeParams.id, command: 'unassignstaff'}, scope.staffData, function (data) {
+                        $modalInstance.close('unassign');
                         route.reload();
                     });
-                    $modalInstance.close('unassign');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -62,9 +62,9 @@
             var GroupDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.groupResource.delete({groupId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/groups');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/loanAccount/ViewLoanChargeController.js b/app/scripts/controllers/loanAccount/ViewLoanChargeController.js
index b240018d..c235c10d 100644
--- a/app/scripts/controllers/loanAccount/ViewLoanChargeController.js
+++ b/app/scripts/controllers/loanAccount/ViewLoanChargeController.js
@@ -22,9 +22,9 @@
             var ChargeDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.loanResource.delete({ resourceType: 'charges', loanId: scope.loanId, resourceId: scope.chargeId}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/viewloanaccount/' + scope.loanId);
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/loanAccount/ViewLoanCollateralController.js b/app/scripts/controllers/loanAccount/ViewLoanCollateralController.js
index 624f6fcb..fc8f7963 100644
--- a/app/scripts/controllers/loanAccount/ViewLoanCollateralController.js
+++ b/app/scripts/controllers/loanAccount/ViewLoanCollateralController.js
@@ -16,9 +16,9 @@
             var CollateralDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.loanResource.delete({ resourceType: 'collaterals', loanId: scope.loanId, resourceId: scope.collateralId}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/viewloanaccount/' + scope.loanId);
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
index cc6da3eb..18da6a32 100644
--- a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
+++ b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
@@ -97,9 +97,9 @@
             var DelChargeCtrl = function ($scope, $modalInstance, ids) {
                 $scope.delete = function () {
                     resourceFactory.LoanAccountResource.delete({loanId: routeParams.id, resourceType: 'charges', chargeId: ids}, {}, function (data) {
+                        $modalInstance.close('delete');
                         route.reload();
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -314,9 +314,9 @@
             var GuarantorDeleteCtrl = function ($scope, $modalInstance, id) {
                 $scope.delete = function () {
                     resourceFactory.guarantorResource.delete({loanId: routeParams.id, templateResource: id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         route.reload();
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/main/LoginFormController.js b/app/scripts/controllers/main/LoginFormController.js
index 9a5208f1..81302176 100644
--- a/app/scripts/controllers/main/LoginFormController.js
+++ b/app/scripts/controllers/main/LoginFormController.js
@@ -7,8 +7,7 @@
 
             scope.login = function () {
                 authenticationService.authenticateWithUsernamePassword(scope.loginCredentials);
-                //clearing username and password fields
-                scope.loginCredentials = {};
+                delete scope.loginCredentials.password;
             };
 
             $('#pwd').keypress(function (e) {
diff --git a/app/scripts/controllers/main/ViewCheckerinboxController.js b/app/scripts/controllers/main/ViewCheckerinboxController.js
index bc9d8b04..3d975dea 100644
--- a/app/scripts/controllers/main/ViewCheckerinboxController.js
+++ b/app/scripts/controllers/main/ViewCheckerinboxController.js
@@ -21,9 +21,9 @@
 
                 $scope.approve = function () {
                     resourceFactory.checkerInboxResource.save({templateResource: routeParams.id, command: 'approve'}, {}, function (data) {
+                        $modalInstance.close('approve');
                         location.path('/checkeractionperformed');
                     });
-                    $modalInstance.close('approve');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -39,9 +39,9 @@
             var DeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.checkerInboxResource.delete({templateResource: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/checkeractionperformed');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/organization/AddCodeController.js b/app/scripts/controllers/organization/AddCodeController.js
deleted file mode 100644
index fbca09cf..00000000
--- a/app/scripts/controllers/organization/AddCodeController.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function (module) {
-    mifosX.controllers = _.extend(module, {
-        AddCodeController: function (scope, resourceFactory, location) {
-            scope.codes = [];
-            resourceFactory.codeResources.getAllCodes(function (data) {
-                scope.codes = data;
-            });
-
-            scope.submit = function () {
-                resourceFactory.codeResources.save(this.formData, function (data) {
-                    location.path('/codes');
-                });
-            };
-        }
-    });
-    mifosX.ng.application.controller('AddCodeController', ['$scope', 'ResourceFactory', '$location', mifosX.controllers.AddCodeController]).run(function ($log) {
-        $log.info("AddCodeController initialized");
-    });
-}(mifosX.controllers || {}));
-
diff --git a/app/scripts/controllers/organization/DataTableController.js b/app/scripts/controllers/organization/DataTableController.js
deleted file mode 100644
index 7ef27773..00000000
--- a/app/scripts/controllers/organization/DataTableController.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function (module) {
-    mifosX.controllers = _.extend(module, {
-        DataTableController: function (scope, resourceFactory) {
-
-            resourceFactory.DataTablesResource.getAllDataTables(function (data) {
-                scope.datatables = data;
-            });
-
-        }
-    });
-    mifosX.ng.application.controller('DataTableController', ['$scope', 'ResourceFactory', mifosX.controllers.DataTableController]).run(function ($log) {
-        $log.info("DataTableController initialized");
-    });
-}(mifosX.controllers || {}));
diff --git a/app/scripts/controllers/organization/ViewAccRuleController.js b/app/scripts/controllers/organization/ViewAccRuleController.js
deleted file mode 100644
index 2d5640d3..00000000
--- a/app/scripts/controllers/organization/ViewAccRuleController.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function (module) {
-    mifosX.controllers = _.extend(module, {
-        ViewAccRuleController: function (scope, resourceFactory, routeParams, location) {
-
-            resourceFactory.accountingRulesResource.getById({accountingRuleId: routeParams.id}, function (data) {
-                scope.rule = data;
-            });
-
-            scope.deleteRule = function () {
-                resourceFactory.accountingRulesResource.delete({accountingRuleId: routeParams.id}, {}, function (data) {
-                    location.path('/accounting_rules');
-                });
-            };
-
-
-        }
-    });
-    mifosX.ng.application.controller('ViewAccRuleController', ['$scope', 'ResourceFactory', '$routeParams', '$location', mifosX.controllers.ViewAccRuleController]).run(function ($log) {
-        $log.info("ViewAccRuleController initialized");
-    });
-}(mifosX.controllers || {}));
\ No newline at end of file
diff --git a/app/scripts/controllers/organization/ViewCodeController.js b/app/scripts/controllers/organization/ViewCodeController.js
deleted file mode 100644
index f4151ceb..00000000
--- a/app/scripts/controllers/organization/ViewCodeController.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function (module) {
-    mifosX.controllers = _.extend(module, {
-        ViewCodeController: function (scope, routeParams, resourceFactory, location) {
-            scope.codevalues = [];
-            resourceFactory.codeResources.get({codeId: routeParams.id}, function (data) {
-                scope.code = data;
-            });
-            resourceFactory.codeValueResource.getAllCodeValues({codeId: routeParams.id}, function (data) {
-                scope.codevalues = data;
-            });
-            scope.delcode = function () {
-                resourceFactory.codeResources.remove({codeId: routeParams.id}, this.code, function (data) {
-                    location.path('/codes');
-
-                });
-            }
-        }
-    });
-    mifosX.ng.application.controller('ViewCodeController', ['$scope', '$routeParams', 'ResourceFactory', '$location', mifosX.controllers.ViewCodeController]).run(function ($log) {
-        $log.info("ViewCodeController initialized");
-    });
-}(mifosX.controllers || {}));
diff --git a/app/scripts/controllers/organization/ViewDataTableController.js b/app/scripts/controllers/organization/ViewDataTableController.js
deleted file mode 100644
index 518d92df..00000000
--- a/app/scripts/controllers/organization/ViewDataTableController.js
+++ /dev/null
@@ -1,26 +0,0 @@
-(function (module) {
-    mifosX.controllers = _.extend(module, {
-        ViewDataTableController: function (scope, routeParams, resourceFactory) {
-            resourceFactory.DataTablesResource.getTableDetails({datatablename: routeParams.tableName}, function (data) {
-
-                var temp = [];
-                var colName = data.columnHeaderData[0].columnName;
-                if (colName == 'id' || colName == 'client_id' || colName == 'office_id' || colName == 'group_id' || colName == 'center_id' || colName == 'loan_id' || colName == 'savings_account_id') {
-                    data.columnHeaderData.splice(0, 1);
-                }
-
-                for (var i = 0; i < data.columnHeaderData.length; i++) {
-                    if (data.columnHeaderData[i].columnName.indexOf("_cd_") > 0) {
-                        temp = data.columnHeaderData[i].columnName.split("_cd_");
-                        data.columnHeaderData[i].columnName = temp[1];
-                        data.columnHeaderData[i].code = temp[0];
-                    }
-                }
-                scope.datatable = data;
-            });
-        }
-    });
-    mifosX.ng.application.controller('ViewDataTableController', ['$scope', '$routeParams', 'ResourceFactory', mifosX.controllers.ViewDataTableController]).run(function ($log) {
-        $log.info("ViewDataTableController initialized");
-    });
-}(mifosX.controllers || {}));
diff --git a/app/scripts/controllers/organization/ViewHolController.js b/app/scripts/controllers/organization/ViewHolController.js
index 5dc2adee..1112a31c 100644
--- a/app/scripts/controllers/organization/ViewHolController.js
+++ b/app/scripts/controllers/organization/ViewHolController.js
@@ -24,9 +24,9 @@
             var activateHolidayCtrl = function ($scope, $modalInstance) {
                 $scope.activate = function () {
                     resourceFactory.holValueResource.save({holId: routeParams.id, command: 'Activate'}, {}, function (data) {
+                        $modalInstance.close('activate');
                         route.reload();
                     });
-                    $modalInstance.close('activate');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -43,9 +43,9 @@
             var deleteHolidayCtrl = function ($scope, $modalInstance) {
                 $scope.activate = function () {
                     resourceFactory.holValueResource.delete({holId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('activate');
                         location.path('holidays');
                     });
-                    $modalInstance.close('activate');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/organization/ViewRoleController.js b/app/scripts/controllers/organization/ViewRoleController.js
index a4b768a0..d47f685e 100644
--- a/app/scripts/controllers/organization/ViewRoleController.js
+++ b/app/scripts/controllers/organization/ViewRoleController.js
@@ -34,7 +34,6 @@
                     var permissionData = {};
                     permissionData.permissions = this.formData;
                     resourceFactory.rolePermissionResource.update({roleId: routeParams.id}, permissionData, function (data) {
-                        scope.logout();
                         route.reload();
                         scope.isDisabled = true;
 
diff --git a/app/scripts/controllers/product/ViewChargeController.js b/app/scripts/controllers/product/ViewChargeController.js
index c96da62f..a49bf921 100644
--- a/app/scripts/controllers/product/ViewChargeController.js
+++ b/app/scripts/controllers/product/ViewChargeController.js
@@ -16,9 +16,9 @@
             var ChDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.chargeResource.delete({chargeId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/charges');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/product/productmix/ViewProductMixController.js b/app/scripts/controllers/product/productmix/ViewProductMixController.js
index d478b896..df5f4423 100644
--- a/app/scripts/controllers/product/productmix/ViewProductMixController.js
+++ b/app/scripts/controllers/product/productmix/ViewProductMixController.js
@@ -20,9 +20,9 @@
             var ProductmixDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.loanProductResource.delete({loanProductId: routeParams.id, resourceType: 'productmix'}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/productmix');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/system/DataTableEntryController.js b/app/scripts/controllers/system/DataTableEntryController.js
index 9de42c1b..1ae46749 100644
--- a/app/scripts/controllers/system/DataTableEntryController.js
+++ b/app/scripts/controllers/system/DataTableEntryController.js
@@ -83,9 +83,9 @@
                         } else if (data.officeId) {
                             destination = '/viewoffice/' + data.officeId;
                         }
+                        $modalInstance.close('delete');
                         location.path(destination);
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/system/ViewCodeController.js b/app/scripts/controllers/system/ViewCodeController.js
index 19549e9d..b348de9d 100644
--- a/app/scripts/controllers/system/ViewCodeController.js
+++ b/app/scripts/controllers/system/ViewCodeController.js
@@ -45,9 +45,9 @@
             var CodeDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.codeResources.delete({codeId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/codes');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -76,9 +76,9 @@
             var CodeValueDeleteCtrl = function ($scope, $modalInstance, cvid) {
                 $scope.delete = function () {
                     resourceFactory.codeValueResource.delete({codeId: routeParams.id, codevalueId: cvid}, {}, function (data) {
+                        $modalInstance.close('delete');
                         route.reload();
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/system/ViewDataTableController.js b/app/scripts/controllers/system/ViewDataTableController.js
index b9e79733..519a54b1 100644
--- a/app/scripts/controllers/system/ViewDataTableController.js
+++ b/app/scripts/controllers/system/ViewDataTableController.js
@@ -32,9 +32,9 @@
             var TableDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.DataTablesResource.delete({datatablename: routeParams.tableName}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/datatables');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/system/ViewReportController.js b/app/scripts/controllers/system/ViewReportController.js
index 3c2310a4..16b9a2b6 100644
--- a/app/scripts/controllers/system/ViewReportController.js
+++ b/app/scripts/controllers/system/ViewReportController.js
@@ -14,9 +14,9 @@
             var NoncoreReportDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.reportsResource.delete({id: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/reports');
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/template/ViewTemplateController.js b/app/scripts/controllers/template/ViewTemplateController.js
index 1710b47c..dfa63a8a 100644
--- a/app/scripts/controllers/template/ViewTemplateController.js
+++ b/app/scripts/controllers/template/ViewTemplateController.js
@@ -14,11 +14,11 @@
             var TemplateDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.templateResource.delete({templateId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/templates');
                         // added dummy request param because Content-Type header gets removed
                         // if the request does not contain any data (a request body)
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/controllers/user/ViewUserController.js b/app/scripts/controllers/user/ViewUserController.js
index f127b8dd..d27f2a29 100644
--- a/app/scripts/controllers/user/ViewUserController.js
+++ b/app/scripts/controllers/user/ViewUserController.js
@@ -20,9 +20,9 @@
             var ModalInstanceCtrl = function ($scope, $modalInstance) {
                 $scope.save = function (staffId) {
                     resourceFactory.userListResource.update({'userId': routeParams.id}, this.formData, function (data) {
+                        $modalInstance.close('activate');
                         route.reload();
                     });
-                    $modalInstance.close('activate');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
@@ -32,11 +32,11 @@
             var UserDeleteCtrl = function ($scope, $modalInstance) {
                 $scope.delete = function () {
                     resourceFactory.userListResource.delete({userId: routeParams.id}, {}, function (data) {
+                        $modalInstance.close('delete');
                         location.path('/users');
                         // added dummy request param because Content-Type header gets removed
                         // if the request does not contain any data (a request body)
                     });
-                    $modalInstance.close('delete');
                 };
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
diff --git a/app/scripts/services/ResourceFactoryProvider.js b/app/scripts/services/ResourceFactoryProvider.js
index ea322a30..b2af00ae 100644
--- a/app/scripts/services/ResourceFactoryProvider.js
+++ b/app/scripts/services/ResourceFactoryProvider.js
@@ -159,7 +159,7 @@
                     currencyConfigResource: defineResource(apiVer + "/currencies", {}, {
                         get: {method: 'GET', params: {}},
                         update: { method: 'PUT'},
-                        upd: { method: 'PUT', params: {}, isArray: true}
+                        upd: { method: 'PUT', params: {}}
                     }),
                     userListResource: defineResource(apiVer + "/users/:userId", {userId: '@userId'}, {
                         getAllUsers: {method: 'GET', params: {}, isArray: true},
diff --git a/app/views/accounting/view_acc_rule.html b/app/views/accounting/view_acc_rule.html
index 2cffdd24..a799e62c 100644
--- a/app/views/accounting/view_acc_rule.html
+++ b/app/views/accounting/view_acc_rule.html
@@ -20,6 +20,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/accounting/view_close_accounting.html b/app/views/accounting/view_close_accounting.html
index 5fde7574..b3e52f38 100644
--- a/app/views/accounting/view_close_accounting.html
+++ b/app/views/accounting/view_close_accounting.html
@@ -17,6 +17,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>            
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/accounting/view_transactions.html b/app/views/accounting/view_transactions.html
index 1a542d0a..8ad06fdf 100644
--- a/app/views/accounting/view_transactions.html
+++ b/app/views/accounting/view_transactions.html
@@ -24,6 +24,8 @@
             </h4>
         </div>
         <div class="modal-footer">
+            <api-validate></api-validate>
+            <br>        
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="redirect()">{{'label.button.redirecttonewtrx' | translate}}
             </button>
diff --git a/app/views/accounting/viewglaccounting.html b/app/views/accounting/viewglaccounting.html
index 0a47456f..ccb02134 100644
--- a/app/views/accounting/viewglaccounting.html
+++ b/app/views/accounting/viewglaccounting.html
@@ -24,6 +24,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/administration/viewuser.html b/app/views/administration/viewuser.html
index 1541be1b..a26d78e8 100644
--- a/app/views/administration/viewuser.html
+++ b/app/views/administration/viewuser.html
@@ -11,6 +11,8 @@
         </div>
 
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <div class="control-group">
                 <label class="control-label" for="password">{{ 'label.input.password' | translate }}</label>
 
@@ -37,6 +39,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/centers/viewcenter.html b/app/views/centers/viewcenter.html
index 068fb0bf..3a96c11a 100644
--- a/app/views/centers/viewcenter.html
+++ b/app/views/centers/viewcenter.html
@@ -68,6 +68,8 @@
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
             <div class="modal-body ">
+                <api-validate></api-validate>
+                <br>
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
@@ -77,6 +79,8 @@
                 <h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
             </div>
             <div class="modal-body ">
+                <api-validate></api-validate>
+                <br>
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
             </div>
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html
index d34cc7e3..cefa0063 100644
--- a/app/views/clients/viewclient.html
+++ b/app/views/clients/viewclient.html
@@ -62,6 +62,8 @@
         <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
     </div>
@@ -71,6 +73,8 @@
         <h3 class="bolder">{{'label.heading.selectclientimage' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <input type="file" ng-file-select="onFileSelect($files)">
     </div>
     <div class="modal-footer">
@@ -83,6 +87,8 @@
         <h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
     </div>
@@ -111,8 +117,8 @@
             </tr>
             <tr>
                 <th class="table-bold">{{ 'label.input.activationdate' | translate }}</th>
-                <td><span class="padded-td">{{client.timeline.activationDate | DateFormat}}<span
-                        data-ng-hide="client.timeline.activationDate">{{ 'label.notactivated' | translate }}</span></span></td>
+                <td><span class="padded-td">{{client.timeline.activatedOnDate | DateFormat}}<span
+                        data-ng-hide="client.timeline.activatedOnDate">{{ 'label.notactivated' | translate }}</span></span></td>
             </tr>
             <tr data-ng-show="client.officeName">
                 <th class="table-bold">{{ 'label.input.office' | translate }}</th>
@@ -328,14 +334,14 @@
             <td>
                   <span ng-repeat="file in document.documents">
                     {{file.fileName}}&nbsp;&nbsp;
-                    <a target="_blank" href="{{hostUrl}}{{file.docUrl}}"><i class="icon-cloud-download"></i></a>
+                    <a target="_blank" href="{{hostUrl}}{{file.docUrl}}"  has-permission='READ_DOCUMENT'><i class="icon-cloud-download"></i></a>
                   </span>
             </td>
             <td>
                   <span>
-                      <a href="#/addclientidentifierdocument/{{client.id}}/{{document.id}}"><i
+                      <a href="#/addclientidentifierdocument/{{client.id}}/{{document.id}}" has-permission='CREATE_DOCUMENT'><i
                               class="icon-cloud-upload"></i></a>&nbsp;
-                      <a ng-click="deleteClientIdentifierDocument(client.id,document.id,$index)"><i
+                      <a ng-click="deleteClientIdentifierDocument(client.id,document.id,$index)" has-permission='DELETE_CLIENTIDENTIFIER'><i
                               class="icon-remove"></i></a>
                   </span>
             </td>
diff --git a/app/views/groups/viewgroup.html b/app/views/groups/viewgroup.html
index 889a2186..947ea7e3 100644
--- a/app/views/groups/viewgroup.html
+++ b/app/views/groups/viewgroup.html
@@ -82,6 +82,8 @@
         <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
     </div>
@@ -91,6 +93,8 @@
         <h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
     </div>
diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html
index 77b44a70..19ba5e21 100644
--- a/app/views/loans/viewloanaccountdetails.html
+++ b/app/views/loans/viewloanaccountdetails.html
@@ -256,6 +256,8 @@
         <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
     </div>
     <div class="modal-body ">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
     </div>
@@ -608,6 +610,8 @@
         <h3 class="bolder">{{'label.heading.confirm' | translate}}</h3>
     </div>
     <div class="modal-body">
+        <api-validate></api-validate>
+        <br>
         <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
         <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
     </div>
diff --git a/app/views/loans/viewloancharge.html b/app/views/loans/viewloancharge.html
index 4ef7ddea..c08de900 100644
--- a/app/views/loans/viewloancharge.html
+++ b/app/views/loans/viewloancharge.html
@@ -11,6 +11,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/loans/viewloancollateral.html b/app/views/loans/viewloancollateral.html
index c676b5fd..3724e239 100644
--- a/app/views/loans/viewloancollateral.html
+++ b/app/views/loans/viewloancollateral.html
@@ -11,6 +11,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/organization/currencyconfig.html b/app/views/organization/currencyconfig.html
index 7ffdbded..594f6063 100644
--- a/app/views/organization/currencyconfig.html
+++ b/app/views/organization/currencyconfig.html
@@ -47,12 +47,12 @@
 
             <div ng-repeat="currency in selectedCurrOptions">
                 <input disabled="" class="form-control input-xxlarge" placeholder={{currency.displayLabel}}
-                       type="text"/>&nbsp;&nbsp;<a ng-click='deleteCur(currency.code)'><i class="icon-remove"></i></a>
+                       type="text"/>&nbsp;&nbsp;<a ng-click='deleteCur(currency.code)' has-permission='UPDATE_CURRENCY'><i class="icon-remove"></i></a>
             </div>
             <div class="offset5">
                 <button id="cancel" type="reset" ng-click="cancel()" class="btn">{{'label.button.cancel' | translate}}
                 </button>
-                <button id="save" type="submit" ng-click="submit()" class="btn btn-primary">{{'label.button.save' | translate}}
+                <button id="save" type="submit" ng-click="submit()" has-permission='UPDATE_CURRENCY' class="btn btn-primary">{{'label.button.save' | translate}}
                 </button>
             </div>
         </div>
diff --git a/app/views/organization/viewholiday.html b/app/views/organization/viewholiday.html
index 3a260987..80a75df7 100644
--- a/app/views/organization/viewholiday.html
+++ b/app/views/organization/viewholiday.html
@@ -13,6 +13,8 @@
             <h3 class="bolder">{{'label.heading.activateholiday' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="activate()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -22,6 +24,8 @@
             <h3 class="bolder">{{'label.heading.deleteholiday' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="activate()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/products/productmix/viewproductmix.html b/app/views/products/productmix/viewproductmix.html
index b4fbaa58..1542833b 100644
--- a/app/views/products/productmix/viewproductmix.html
+++ b/app/views/products/productmix/viewproductmix.html
@@ -30,6 +30,8 @@
                     <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
                 </div>
                 <div class="modal-body ">
+                    <api-validate></api-validate>
+                    <br>
                     <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                     <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
                 </div>
diff --git a/app/views/products/viewcharge.html b/app/views/products/viewcharge.html
index a7e33c42..0849d157 100644
--- a/app/views/products/viewcharge.html
+++ b/app/views/products/viewcharge.html
@@ -22,6 +22,8 @@
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
             <div class="modal-body ">
+                <api-validate></api-validate>
+                <br>
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
diff --git a/app/views/system/viewcheckerinbox.html b/app/views/system/viewcheckerinbox.html
index c17efe7f..017e7990 100644
--- a/app/views/system/viewcheckerinbox.html
+++ b/app/views/system/viewcheckerinbox.html
@@ -65,6 +65,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -74,6 +76,8 @@
             <h3 class="bolder">{{'label.heading.approve' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="approve()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/system/viewcode.html b/app/views/system/viewcode.html
index 23229381..ef44ce50 100644
--- a/app/views/system/viewcode.html
+++ b/app/views/system/viewcode.html
@@ -13,6 +13,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -22,6 +24,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/system/viewdatatable.html b/app/views/system/viewdatatable.html
index b1004b9d..e073944a 100644
--- a/app/views/system/viewdatatable.html
+++ b/app/views/system/viewdatatable.html
@@ -23,6 +23,8 @@
                     <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
                 </div>
                 <div class="modal-body ">
+                    <api-validate></api-validate>
+                    <br>
                     <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                     <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
                 </div>
diff --git a/app/views/system/viewdatatableentry.html b/app/views/system/viewdatatableentry.html
index 556602da..7d838e72 100644
--- a/app/views/system/viewdatatableentry.html
+++ b/app/views/system/viewdatatableentry.html
@@ -13,7 +13,9 @@
             <div class="modal-header silver">
                 <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
             </div>
-            <div class="modal-body ">
+            <div class="modal-body">
+                <api-validate></api-validate>
+                <br>
                 <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
                 <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
             </div>
diff --git a/app/views/system/viewreport.html b/app/views/system/viewreport.html
index 4cf02269..3cbcb0db 100644
--- a/app/views/system/viewreport.html
+++ b/app/views/system/viewreport.html
@@ -20,6 +20,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/tasks.html b/app/views/tasks.html
index c0361382..ea6dd10d 100644
--- a/app/views/tasks.html
+++ b/app/views/tasks.html
@@ -87,6 +87,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -96,6 +98,8 @@
             <h3 class="bolder">{{'label.heading.approve' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="approve()">{{'label.button.confirm' | translate}}</button>
         </div>
@@ -151,6 +155,8 @@
                 translate}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h3>
         </div>
         <div class="modal-body modal-big">
+            <api-validate></api-validate>
+            <br>
             <input type="text" datepicker-pop="dd MMMM yyyy" ng-model="date.actDate" is-open="opened" min="restrictDate"
                    max="restrictDate"/>
         </div>
@@ -214,6 +220,8 @@
             <h3 class="bolder">{{'label.heading.approve' | translate}}</h3>
         </div>
         <div class="modal-body">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="approve()">{{'label.button.confirm' | translate}}</button>
         </div>
diff --git a/app/views/templates/viewtemplate.html b/app/views/templates/viewtemplate.html
index 72118cb3..de4e39e8 100644
--- a/app/views/templates/viewtemplate.html
+++ b/app/views/templates/viewtemplate.html
@@ -18,6 +18,8 @@
             <h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
         </div>
         <div class="modal-body ">
+            <api-validate></api-validate>
+            <br>
             <button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
             <button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
         </div>