diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index 6201d8829..faa7e657b 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -26,7 +26,7 @@
         };
         (function() {
             var icons = [
-                '../ui/favicon.ico',
+                '../ui/favicon.ico'
             ];
             var styles = [
                 '../ui/css/patternfly.css',
@@ -35,17 +35,17 @@
             var scripts = [
                 '../ui/js/libs/jquery.js',
                 '../ui/js/libs/jquery.ordered-map.js',
-                '../ui/js/dojo/dojo.js',
+                '../ui/js/dojo/dojo.js'
             ];
             ipa_loader.scripts(scripts, function() {
                 require([
                     'dojo/dom',
                     'freeipa/core',
-                    'dojo/domReady!',
+                    'dojo/domReady!'
                     ],
                     function(dom) {
                         var text = require('freeipa/text');
-                        msg = "".concat(
+                        var msg = "".concat(
                             text.get('@i18n:ssbrowser-page.header'),
                             text.get('@i18n:ssbrowser-page.firefox-header'),
                             text.get('@i18n:ssbrowser-page.firefox-actions'),
@@ -53,8 +53,8 @@
                             text.get('@i18n:ssbrowser-page.chrome-certificate'),
                             text.get('@i18n:ssbrowser-page.chrome-spnego'),
                             text.get('@i18n:ssbrowser-page.ie-header'),
-                            text.get('@i18n:ssbrowser-page.ie-actions'),
-                        )
+                            text.get('@i18n:ssbrowser-page.ie-actions')
+                        );
                         dom.byId('ssbrowser-msg').innerHTML=msg;
                     });
             });
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
index b5c22ae33..630982da8 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -26,7 +26,7 @@
         };
         (function() {
             var icons = [
-                '../ui/favicon.ico',
+                '../ui/favicon.ico'
             ];
             var styles = [
                 '../ui/css/patternfly.css',
@@ -35,18 +35,19 @@
             var scripts = [
                 '../ui/js/libs/jquery.js',
                 '../ui/js/libs/jquery.ordered-map.js',
-                '../ui/js/dojo/dojo.js',
+                '../ui/js/dojo/dojo.js'
             ];
 
             ipa_loader.scripts(scripts, function() {
                 require([
                     'dojo/dom',
                     'freeipa/core',
-                    'dojo/domReady!',
+                    'dojo/domReady!'
                     ],
                     function(dom) {
                         var text = require('freeipa/text');
-                        if (msg = text.get('@i18n:unauthorized-page')) {
+                        var msg = text.get('@i18n:unauthorized-page');
+                        if (msg) {
                             dom.byId('unauthorized-msg').innerHTML=msg;
                         }
                     });
diff --git a/install/migration/index.html b/install/migration/index.html
index 7cdd6e38a..fca517cdc 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -10,7 +10,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="../ui/" target="_blank">
-    <script type="text/javascript" src="js/libs/loader.js"></script>
+    <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
     <script type="text/javascript">
         var dojoConfig = {
             baseUrl: "js",
diff --git a/install/ui/jsl.conf b/install/ui/jsl.conf
index 9f0858804..1578639ec 100644
--- a/install/ui/jsl.conf
+++ b/install/ui/jsl.conf
@@ -130,7 +130,9 @@
 # or "+process Folder\Path\*.htm".
 #
 
-+process index.html
++process ./*.html
++process ../migration/*.html
++process ../html/*.html
 +process src/libs/browser.js
 +process src/libs/jquery.ordered-map.js
 +process src/freeipa/*.js
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index cd2d81fbc..f34ba81a4 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -206,7 +206,7 @@ return {
             $type: 'association',
             name: 'member_privilege',
             facet_group: 'privilege',
-            remove_title: '@i18n:objects.acipermission.remove_privileges',
+            remove_title: '@i18n:objects.acipermission.remove_privileges'
         }
     ],
     adder_dialog: {
@@ -301,8 +301,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.acipermission.remove',
-    },
+        title: '@i18n:objects.acipermission.remove'
+    }
 };};
 
 /**
@@ -355,7 +355,7 @@ return {
             add_method: 'add_privilege',
             remove_method: 'remove_privilege',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.aciprivilege.remove_roles',
+            remove_title: '@i18n:objects.aciprivilege.remove_roles'
         },
         {
             $type: 'association',
@@ -363,7 +363,7 @@ return {
             facet_group: 'permission',
             add_method: 'add_permission',
             remove_method: 'remove_permission',
-            remove_title: '@i18n:objects.aciprivilege.remove_from_permissions',
+            remove_title: '@i18n:objects.aciprivilege.remove_from_permissions'
         }
     ],
     standard_association_facets: true,
@@ -377,8 +377,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.aciprivilege.remove',
-    },
+        title: '@i18n:objects.aciprivilege.remove'
+    }
 };};
 
 var make_role_spec = function() {
@@ -412,27 +412,27 @@ return {
         {
             $type: 'association',
             name: 'member_user',
-            remove_title: '@i18n:objects.acirole.remove_users',
+            remove_title: '@i18n:objects.acirole.remove_users'
         },
         {
             $type: 'association',
             name: 'member_group',
-            remove_title: '@i18n:objects.acirole.remove_groups',
+            remove_title: '@i18n:objects.acirole.remove_groups'
         },
         {
             $type: 'association',
             name: 'member_host',
-            remove_title: '@i18n:objects.acirole.remove_hosts',
+            remove_title: '@i18n:objects.acirole.remove_hosts'
         },
         {
             $type: 'association',
             name: 'member_hostgroup',
-            remove_title: '@i18n:objects.acirole.remove_hostgroups',
+            remove_title: '@i18n:objects.acirole.remove_hostgroups'
         },
         {
             $type: 'association',
             name: 'member_service',
-            remove_title: '@i18n:objects.acirole.remove_services',
+            remove_title: '@i18n:objects.acirole.remove_services'
         },
         {
             $type: 'association',
@@ -440,7 +440,7 @@ return {
             facet_group: 'privilege',
             add_method: 'add_privilege',
             remove_method: 'remove_privilege',
-            remove_title: '@i18n:objects.acirole.remove_from_privileges',
+            remove_title: '@i18n:objects.acirole.remove_from_privileges'
         }
     ],
     standard_association_facets: true,
@@ -454,8 +454,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.acirole.remove',
-    },
+        title: '@i18n:objects.acirole.remove'
+    }
 };};
 
 var make_selfservice_spec = function() {
@@ -497,8 +497,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.aciselfservice.remove',
-    },
+        title: '@i18n:objects.aciselfservice.remove'
+    }
 };};
 
 
@@ -577,8 +577,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.acidelegation.remove',
-    },
+        title: '@i18n:objects.acidelegation.remove'
+    }
 };};
 
 aci.attributes_widget = function(spec) {
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index 5c5144b8b..e87812c65 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -297,8 +297,8 @@ IPA.automember.rule_details_facet = function(spec) {
                         ]
                     },
                     deleter_dialog: {
-                        title: '@i18n:objects.automember.remove_inc_conditions',
-                    },
+                        title: '@i18n:objects.automember.remove_inc_conditions'
+                    }
                 }
             ]
         },
@@ -330,8 +330,8 @@ IPA.automember.rule_details_facet = function(spec) {
                         ]
                     },
                     deleter_dialog: {
-                        title: '@i18n:objects.automember.remove_exc_conditions',
-                    },
+                        title: '@i18n:objects.automember.remove_exc_conditions'
+                    }
                 }
             ]
         }
diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index 38c0bdef7..afb80a2f1 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -66,8 +66,8 @@ return {
         fields: [ 'cn' ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.automountlocation.remove',
-    },
+        title: '@i18n:objects.automountlocation.remove'
+    }
 };};
 
 var make_map_spec = function() {
@@ -156,8 +156,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.automountmap.remove',
-    },
+        title: '@i18n:objects.automountmap.remove'
+    }
 };};
 
 var make_key_spec = function() {
@@ -210,8 +210,8 @@ return {
         fields:['automountkey','automountinformation']
     },
     deleter_dialog: {
-        title: '@i18n:objects.automountkey.remove',
-    },
+        title: '@i18n:objects.automountkey.remove'
+    }
 };};
 
 IPA.automount.key_details_facet = function(spec) {
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index fe2f27189..b7b265ce2 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -329,8 +329,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.dnszone.remove',
-    },
+        title: '@i18n:objects.dnszone.remove'
+    }
 };};
 
 var make_forwardzone_spec = function() {
@@ -504,8 +504,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.dnsforwardzone.remove',
-    },
+        title: '@i18n:objects.dnsforwardzone.remove'
+    }
 };};
 
 
@@ -1384,8 +1384,8 @@ return {
     },
     deleter_dialog: {
         title: '@i18n:objects.dnsrecord.remove',
-        $factory: IPA.dns.record_search_deleter_dialog,
-    },
+        $factory: IPA.dns.record_search_deleter_dialog
+    }
 };};
 
 IPA.dns.record_adder_dialog = function(spec) {
diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
index 1acb426d5..7d0f771af 100644
--- a/install/ui/src/freeipa/group.js
+++ b/install/ui/src/freeipa/group.js
@@ -123,17 +123,17 @@ return {
                     primary_key: true
                 }
             ],
-            remove_title: '@i18n:objects.group.remove_users',
+            remove_title: '@i18n:objects.group.remove_users'
         },
         {
             $type: 'association',
             name: 'member_group',
-            remove_title: '@i18n:objects.group.remove_groups',
+            remove_title: '@i18n:objects.group.remove_groups'
         },
         {
             $type: 'association',
             name: 'member_service',
-            remove_title: '@i18n:objects.group.remove_services',
+            remove_title: '@i18n:objects.group.remove_services'
         },
         {
             $type: 'attribute',
@@ -152,19 +152,19 @@ return {
             $type: 'association',
             name: 'memberof_group',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.group.remove_from_groups',
+            remove_title: '@i18n:objects.group.remove_from_groups'
         },
         {
             $type: 'association',
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.group.remove_from_netgroups',
+            remove_title: '@i18n:objects.group.remove_from_netgroups'
         },
         {
             $type: 'association',
             name: 'memberof_role',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.group.remove_from_roles',
+            remove_title: '@i18n:objects.group.remove_from_roles'
         },
         {
             $type: 'association',
@@ -172,7 +172,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_user',
             remove_method: 'remove_user',
-            remove_title: '@i18n:objects.group.remove_from_hbac',
+            remove_title: '@i18n:objects.group.remove_from_hbac'
         },
         {
             $type: 'association',
@@ -180,7 +180,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_user',
             remove_method: 'remove_user',
-            remove_title: '@i18n:objects.group.remove_from_sudo',
+            remove_title: '@i18n:objects.group.remove_from_sudo'
         }
     ],
     standard_association_facets: true,
@@ -217,8 +217,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.group.remove',
-    },
+        title: '@i18n:objects.group.remove'
+    }
 };};
 
 IPA.group_adder_dialog = function(spec) {
diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index b5827dc3b..a47b2bc68 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -100,8 +100,8 @@ var spec =  {
         fields: [ 'cn' ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.hbacrule.remove',
-    },
+        title: '@i18n:objects.hbacrule.remove'
+    }
 };
 
     add_hbacrule_details_facet_widgets(spec.facets[1]);
@@ -154,7 +154,7 @@ return {
                     width: '100px'
                 }
             ],
-            remove_title: '@i18n:objects.hbacsvc.remove_from_hbacsvcgroups',
+            remove_title: '@i18n:objects.hbacsvc.remove_from_hbacsvcgroups'
         }
     ],
     standard_association_facets: true,
@@ -168,8 +168,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.hbacsvc.remove',
-    },
+        title: '@i18n:objects.hbacsvc.remove'
+    }
 };};
 
 var make_service_group_spec = function() {
@@ -217,7 +217,7 @@ return {
                     width: '100px'
                 }
             ],
-            remove_title: '@i18n:objects.hbacsvcgroup.remove_hbacsvcs',
+            remove_title: '@i18n:objects.hbacsvcgroup.remove_hbacsvcs'
         }
     ],
     standard_association_facets: true,
@@ -231,8 +231,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.hbacsvcgroup.remove',
-    },
+        title: '@i18n:objects.hbacsvcgroup.remove'
+    }
 };};
 
 /**
@@ -327,7 +327,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_users',
+                            remove_title: '@i18n:objects.hbacrule.remove_users'
                         },
                         {
                             $type: 'rule_association_table',
@@ -336,7 +336,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_groups',
+                            remove_title: '@i18n:objects.hbacrule.remove_groups'
                         }
                     ]
                 }
@@ -400,7 +400,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_hosts',
+                            remove_title: '@i18n:objects.hbacrule.remove_hosts'
                         },
                         {
                             $type: 'rule_association_table',
@@ -409,7 +409,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_hostgroups',
+                            remove_title: '@i18n:objects.hbacrule.remove_hostgroups'
                         }
                     ]
                 }
@@ -467,7 +467,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_service',
                             remove_method: 'remove_service',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_services',
+                            remove_title: '@i18n:objects.hbacrule.remove_services'
                         },
                         {
                             $type: 'rule_association_table',
@@ -476,7 +476,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             add_method: 'add_service',
                             remove_method: 'remove_service',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.hbacrule.remove_servicegroups',
+                            remove_title: '@i18n:objects.hbacrule.remove_servicegroups'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 1b27bf27b..21720415e 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -405,25 +405,25 @@ return {
             name: 'managedby_host',
             add_method: 'add_managedby',
             remove_method: 'remove_managedby',
-            remove_title: '@i18n:objects.host.remove_hosts_managing',
+            remove_title: '@i18n:objects.host.remove_hosts_managing'
         },
         {
             $type: 'association',
             name: 'memberof_hostgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.host.remove_from_groups',
+            remove_title: '@i18n:objects.host.remove_from_groups'
         },
         {
             $type: 'association',
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.host.remove_from_netgroups',
+            remove_title: '@i18n:objects.host.remove_from_netgroups'
         },
         {
             $type: 'association',
             name: 'memberof_role',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.host.remove_from_roles',
+            remove_title: '@i18n:objects.host.remove_from_roles'
         },
         {
             $type: 'association',
@@ -431,7 +431,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_host',
             remove_method: 'remove_host',
-            remove_title: '@i18n:objects.host.remove_from_hbac',
+            remove_title: '@i18n:objects.host.remove_from_hbac'
         },
         {
             $type: 'association',
@@ -439,7 +439,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_host',
             remove_method: 'remove_host',
-            remove_title: '@i18n:objects.host.remove_from_sudo',
+            remove_title: '@i18n:objects.host.remove_from_sudo'
         }
     ],
     standard_association_facets: true,
diff --git a/install/ui/src/freeipa/hostgroup.js b/install/ui/src/freeipa/hostgroup.js
index 22cd24296..3788aeb05 100644
--- a/install/ui/src/freeipa/hostgroup.js
+++ b/install/ui/src/freeipa/hostgroup.js
@@ -66,24 +66,24 @@ return {
         {
             $type: 'association',
             name: 'member_host',
-            remove_title: '@i18n:objects.hostgroup.remove_hosts',
+            remove_title: '@i18n:objects.hostgroup.remove_hosts'
         },
         {
             $type: 'association',
             name: 'member_hostgroup',
-            remove_title: '@i18n:objects.hostgroup.remove_hostgroups',
+            remove_title: '@i18n:objects.hostgroup.remove_hostgroups'
         },
         {
             $type: 'association',
             name: 'memberof_hostgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.hostgroup.remove_from_hostgroups',
+            remove_title: '@i18n:objects.hostgroup.remove_from_hostgroups'
         },
         {
             $type: 'association',
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.hostgroup.remove_from_netgroups',
+            remove_title: '@i18n:objects.hostgroup.remove_from_netgroups'
         },
         {
             $type: 'association',
@@ -91,7 +91,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_host',
             remove_method: 'remove_host',
-            remove_title: '@i18n:objects.hostgroup.remove_from_hbac',
+            remove_title: '@i18n:objects.hostgroup.remove_from_hbac'
         },
         {
             $type: 'association',
@@ -99,7 +99,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_host',
             remove_method: 'remove_host',
-            remove_title: '@i18n:objects.hostgroup.remove_from_sudo',
+            remove_title: '@i18n:objects.hostgroup.remove_from_sudo'
         }
     ],
     standard_association_facets: true,
@@ -113,8 +113,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.hostgroup.remove',
-    },
+        title: '@i18n:objects.hostgroup.remove'
+    }
 };};
 
 
diff --git a/install/ui/src/freeipa/idrange.js b/install/ui/src/freeipa/idrange.js
index b77c47e39..35ec6d96d 100644
--- a/install/ui/src/freeipa/idrange.js
+++ b/install/ui/src/freeipa/idrange.js
@@ -147,8 +147,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.idrange.remove',
-    },
+        title: '@i18n:objects.idrange.remove'
+    }
 };};
 
 IPA.idrange_adder_policy = function(spec) {
diff --git a/install/ui/src/freeipa/idviews.js b/install/ui/src/freeipa/idviews.js
index 66cdf4950..c55db0717 100644
--- a/install/ui/src/freeipa/idviews.js
+++ b/install/ui/src/freeipa/idviews.js
@@ -217,8 +217,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.idview.remove',
-    },
+        title: '@i18n:objects.idview.remove'
+    }
 };};
 
 var make_idoverrideuser_spec = function() {
@@ -333,8 +333,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.idview.remove_users',
-    },
+        title: '@i18n:objects.idview.remove_users'
+    }
 };};
 
 var make_idoverridegroup_spec = function() {
@@ -416,8 +416,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.idview.remove_groups',
-    },
+        title: '@i18n:objects.idview.remove_groups'
+    }
 };};
 
 
diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js
index 235b9dae6..09fffee09 100644
--- a/install/ui/src/freeipa/netgroup.js
+++ b/install/ui/src/freeipa/netgroup.js
@@ -60,13 +60,13 @@ var spec = {
         {
             $type: 'association',
             name: 'member_netgroup',
-            remove_title: '@i18n:objects.netgroup.remove_netgroups',
+            remove_title: '@i18n:objects.netgroup.remove_netgroups'
         },
         {
             $type: 'association',
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.netgroup.remove_from_netgroups',
+            remove_title: '@i18n:objects.netgroup.remove_from_netgroups'
         }
     ],
     standard_association_facets: true,
@@ -80,8 +80,8 @@ var spec = {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.netgroup.remove',
-    },
+        title: '@i18n:objects.netgroup.remove'
+    }
 };
 
     add_netgroup_details_facet_widgets(spec.facets[1]);
diff --git a/install/ui/src/freeipa/otptoken.js b/install/ui/src/freeipa/otptoken.js
index 95bb8808e..263b03aee 100644
--- a/install/ui/src/freeipa/otptoken.js
+++ b/install/ui/src/freeipa/otptoken.js
@@ -227,7 +227,7 @@ return {
             name: 'managedby_user',
             add_method: 'add_managedby',
             remove_method: 'remove_managedby',
-            remove_title: '@i18n:objects.otptoken.remove_users_managing',
+            remove_title: '@i18n:objects.otptoken.remove_users_managing'
         }
     ],
 
@@ -308,8 +308,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.otptoken.remove',
-    },
+        title: '@i18n:objects.otptoken.remove'
+    }
 };};
 
 otptoken.adder_policy = function(spec) {
diff --git a/install/ui/src/freeipa/plugins/ca.js b/install/ui/src/freeipa/plugins/ca.js
index 33a21f010..1b0acbbce 100644
--- a/install/ui/src/freeipa/plugins/ca.js
+++ b/install/ui/src/freeipa/plugins/ca.js
@@ -65,8 +65,8 @@ function(IPA, $, phases, reg, cert) {
              ]
          },
          deleter_dialog: {
-             title: '@i18n:objects.ca.remove',
-         },
+             title: '@i18n:objects.ca.remove'
+         }
      };
 
      return spec;
diff --git a/install/ui/src/freeipa/plugins/caacl.js b/install/ui/src/freeipa/plugins/caacl.js
index 57ec84bad..751a3f5fe 100644
--- a/install/ui/src/freeipa/plugins/caacl.js
+++ b/install/ui/src/freeipa/plugins/caacl.js
@@ -104,8 +104,8 @@ var spec = {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.caacl.remove',
-    },
+        title: '@i18n:objects.caacl.remove'
+    }
 };
 
     add_caacl_details_facet_widgets(spec.facets[1]);
@@ -197,7 +197,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_profile',
                             remove_method: 'remove_profile',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_profiles',
+                            remove_title: '@i18n:objects.caacl.remove_profiles'
                         }
                     ]
                 }
@@ -302,7 +302,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_users',
+                            remove_title: '@i18n:objects.caacl.remove_users'
                         },
                         {
                             $type: 'rule_association_table',
@@ -311,7 +311,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_groups',
+                            remove_title: '@i18n:objects.caacl.remove_groups'
                         }
                     ]
                 },
@@ -341,7 +341,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_hosts',
+                            remove_title: '@i18n:objects.caacl.remove_hosts'
                         },
                         {
                             $type: 'rule_association_table',
@@ -350,7 +350,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_hostgroups',
+                            remove_title: '@i18n:objects.caacl.remove_hostgroups'
                         }
                     ]
                 },
@@ -373,7 +373,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_service',
                             remove_method: 'remove_service',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_services',
+                            remove_title: '@i18n:objects.caacl.remove_services'
                         }
                     ]
                 },
@@ -397,7 +397,7 @@ var add_caacl_details_facet_widgets = function (spec) {
                             add_method: 'add_ca',
                             remove_method: 'remove_ca',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.caacl.remove_ca',
+                            remove_title: '@i18n:objects.caacl.remove_ca'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/plugins/certmap.js b/install/ui/src/freeipa/plugins/certmap.js
index 04c54d506..e20467f61 100644
--- a/install/ui/src/freeipa/plugins/certmap.js
+++ b/install/ui/src/freeipa/plugins/certmap.js
@@ -167,8 +167,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.certmap.remove',
-    },
+        title: '@i18n:objects.certmap.remove'
+    }
 };};
 
 
diff --git a/install/ui/src/freeipa/plugins/certprofile.js b/install/ui/src/freeipa/plugins/certprofile.js
index 330d3504f..9ffae7548 100644
--- a/install/ui/src/freeipa/plugins/certprofile.js
+++ b/install/ui/src/freeipa/plugins/certprofile.js
@@ -60,8 +60,8 @@ return {
         }
     ],
     deleter_dialog: {
-        title: '@i18n:objects.caprofile.remove',
-    },
+        title: '@i18n:objects.caprofile.remove'
+    }
 };};
 
 
diff --git a/install/ui/src/freeipa/policy.js b/install/ui/src/freeipa/policy.js
index b890f2bda..3e04986ab 100644
--- a/install/ui/src/freeipa/policy.js
+++ b/install/ui/src/freeipa/policy.js
@@ -95,8 +95,8 @@ return {
         height: 300
     },
     deleter_dialog: {
-        title: '@i18n:objects.pwpolicy.remove',
-    },
+        title: '@i18n:objects.pwpolicy.remove'
+    }
 };};
 
 exp.krbtpolicy = IPA.krbtpolicy = {};
diff --git a/install/ui/src/freeipa/radiusproxy.js b/install/ui/src/freeipa/radiusproxy.js
index cb464ec9e..f44eb870c 100644
--- a/install/ui/src/freeipa/radiusproxy.js
+++ b/install/ui/src/freeipa/radiusproxy.js
@@ -107,8 +107,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.radiusproxy.remove',
-    },
+        title: '@i18n:objects.radiusproxy.remove'
+    }
 };};
 
 /**
diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js
index bbc764b36..d1ff1f864 100644
--- a/install/ui/src/freeipa/selinux.js
+++ b/install/ui/src/freeipa/selinux.js
@@ -101,8 +101,8 @@ var spec = {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.selinuxusermap.remove',
-    },
+        title: '@i18n:objects.selinuxusermap.remove'
+    }
 };
 
     add_selinux_details_facet_widgets(spec.facets[1]);
@@ -221,7 +221,7 @@ var add_selinux_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.selinuxusermap.remove_users',
+                            remove_title: '@i18n:objects.selinuxusermap.remove_users'
                         },
                         {
                             $type: 'rule_association_table',
@@ -230,7 +230,7 @@ var add_selinux_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.selinuxusermap.remove_groups',
+                            remove_title: '@i18n:objects.selinuxusermap.remove_groups'
                         }
                     ]
                 }
@@ -294,7 +294,7 @@ var add_selinux_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.selinuxusermap.remove_hosts',
+                            remove_title: '@i18n:objects.selinuxusermap.remove_hosts'
                         },
                         {
                             $type: 'rule_association_table',
@@ -303,7 +303,7 @@ var add_selinux_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.selinuxusermap.remove_hostgroups',
+                            remove_title: '@i18n:objects.selinuxusermap.remove_hostgroups'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index efd4f695d..09f5aa465 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -369,14 +369,14 @@ return {
         {
             $type: 'association',
             name: 'memberof_role',
-            remove_title: '@i18n:objects.service.remove_from_roles',
+            remove_title: '@i18n:objects.service.remove_from_roles'
         },
         {
             $type: 'association',
             name: 'managedby_host',
             add_method: 'add_host',
             remove_method: 'remove_host',
-            remove_title: '@i18n:objects.service.remove_hosts_managing',
+            remove_title: '@i18n:objects.service.remove_hosts_managing'
         }
     ],
     standard_association_facets: true,
@@ -432,8 +432,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.service.remove',
-    },
+        title: '@i18n:objects.service.remove'
+    }
 };};
 
 
diff --git a/install/ui/src/freeipa/stageuser.js b/install/ui/src/freeipa/stageuser.js
index 75f03bb89..470195ba9 100644
--- a/install/ui/src/freeipa/stageuser.js
+++ b/install/ui/src/freeipa/stageuser.js
@@ -90,8 +90,8 @@ return {
             ],
             deleter_dialog: {
                 title: '@i18n:objects.stageuser.remove',
-                $factory: IPA.search_deleter_dialog,
-            },
+                $factory: IPA.search_deleter_dialog
+            }
         },
         {
             $type: 'details',
@@ -336,8 +336,8 @@ stageuser.search_preserved_facet_spec = {
     ],
     deleter_dialog: {
         title: '@i18n:objects.stageuser.preserved_remove',
-        $factory: IPA.search_deleter_dialog,
-    },
+        $factory: IPA.search_deleter_dialog
+    }
 };
 
 mod_user.entity_spec.policies = mod_user.entity_spec.policies || {};
diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index c0b6ccf85..729f35991 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -100,8 +100,8 @@ var spec = {
         fields: [ 'cn' ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.sudorule.remove',
-    },
+        title: '@i18n:objects.sudorule.remove'
+    }
 };
 
     add_sudorule_details_facet_widgets(spec.facets[1]);
@@ -155,7 +155,7 @@ return {
                     width: '100px'
                 }
             ],
-            remove_title: '@i18n:objects.sudocmd.remove_from_sudocmdgroups',
+            remove_title: '@i18n:objects.sudocmd.remove_from_sudocmdgroups'
         }
     ],
     standard_association_facets: true,
@@ -169,8 +169,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.sudocmd.remove',
-    },
+        title: '@i18n:objects.sudocmd.remove'
+    }
 };};
 
 
@@ -219,7 +219,7 @@ return {
                     width: '100px'
                 }
             ],
-            remove_title: '@i18n:objects.sudocmdgroup.remove_sudocmds',
+            remove_title: '@i18n:objects.sudocmdgroup.remove_sudocmds'
         }
     ],
     standard_association_facets: true,
@@ -233,8 +233,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.sudocmdgroup.remove',
-    },
+        title: '@i18n:objects.sudocmdgroup.remove'
+    }
 };};
 
 /**
@@ -359,7 +359,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             remove_method: 'remove_user',
                             external: 'externaluser',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.sudorule.remove_users',
+                            remove_title: '@i18n:objects.sudorule.remove_users'
                         },
                         {
                             $type: 'rule_association_table',
@@ -368,7 +368,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_user',
                             remove_method: 'remove_user',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.sudorule.remove_groups',
+                            remove_title: '@i18n:objects.sudorule.remove_groups'
                         }
                     ]
                 }
@@ -434,7 +434,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             remove_method: 'remove_host',
                             external: 'externalhost',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.sudorule.remove_hosts',
+                            remove_title: '@i18n:objects.sudorule.remove_hosts'
                         },
                         {
                             $type: 'rule_association_table',
@@ -443,7 +443,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_host',
                             remove_method: 'remove_host',
                             add_title: '@i18n:association.add.member',
-                            remove_title: '@i18n:objects.sudorule.remove_hostgroups',
+                            remove_title: '@i18n:objects.sudorule.remove_hostgroups'
                         }
                     ]
                 }
@@ -527,7 +527,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_allow_command',
                             remove_method: 'remove_allow_command',
                             add_title: '@i18n:association.add.memberallowcmd',
-                            remove_title: '@i18n:objects.sudorule.remove_allow_cmds',
+                            remove_title: '@i18n:objects.sudorule.remove_allow_cmds'
                         },
                         {
                             $type: 'rule_association_table',
@@ -536,7 +536,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_allow_command',
                             remove_method: 'remove_allow_command',
                             add_title: '@i18n:association.add.memberallowcmd',
-                            remove_title: '@i18n:objects.sudorule.remove_allow_cmdgroups',
+                            remove_title: '@i18n:objects.sudorule.remove_allow_cmdgroups'
                         },
                         {
                             $factory: IPA.header_widget,
@@ -551,7 +551,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_deny_command',
                             remove_method: 'remove_deny_command',
                             add_title: '@i18n:association.add.memberdenycmd',
-                            remove_title: '@i18n:objects.sudorule.remove_deny_cmds',
+                            remove_title: '@i18n:objects.sudorule.remove_deny_cmds'
                         },
                         {
                             $type: 'rule_association_table',
@@ -560,7 +560,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_deny_command',
                             remove_method: 'remove_deny_command',
                             add_title: '@i18n:association.add.memberdenycmd',
-                            remove_title: '@i18n:objects.sudorule.remove_deny_cmdgroups',
+                            remove_title: '@i18n:objects.sudorule.remove_deny_cmdgroups'
                         }
                     ]
                 }
@@ -632,7 +632,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_runasuser',
                             remove_method: 'remove_runasuser',
                             add_title: '@i18n:association.add.ipasudorunas',
-                            remove_title: '@i18n:objects.sudorule.remove_runas_users',
+                            remove_title: '@i18n:objects.sudorule.remove_runas_users'
                         },
                         {
                             $type: 'rule_association_table',
@@ -641,7 +641,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                             add_method: 'add_runasuser',
                             remove_method: 'remove_runasuser',
                             add_title: '@i18n:association.add.ipasudorunas',
-                            remove_title: '@i18n:objects.sudorule.remove_runas_usergroups',
+                            remove_title: '@i18n:objects.sudorule.remove_runas_usergroups'
                         }
                     ]
                 },
@@ -664,7 +664,7 @@ var add_sudorule_details_facet_widgets = function (spec) {
                         add_method: 'add_runasgroup',
                         remove_method: 'remove_runasgroup',
                         add_title: '@i18n:association.add.ipasudorunasgroup',
-                        remove_title: '@i18n:objects.sudorule.remove_runas_groups',
+                        remove_title: '@i18n:objects.sudorule.remove_runas_groups'
                     }]
                 }
             ]
diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js
index 91b41ea21..4c4b381e7 100644
--- a/install/ui/src/freeipa/topology.js
+++ b/install/ui/src/freeipa/topology.js
@@ -192,8 +192,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.topologysegment.remove',
-    },
+        title: '@i18n:objects.topologysegment.remove'
+    }
 };};
 
 var make_server_spec = function() {
@@ -449,7 +449,7 @@ return {
                                     name: 'service_relative_weight'
                                 }
                             ],
-                            remove_title: '@i18n:objects.topologylocation.remove_servers',
+                            remove_title: '@i18n:objects.topologylocation.remove_servers'
                         }
                     ]
                 }
@@ -467,8 +467,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.topologylocation.remove',
-    },
+        title: '@i18n:objects.topologylocation.remove'
+    }
 };};
 
 topology.location_adapter = declare([mod_field.Adapter], {
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index 98afa3cf8..a7e2c4db6 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -70,7 +70,7 @@ return {
             search_all_entries: true,
             deleter_dialog: {
                 title: '@i18n:objects.trust.remove_domains',
-                $factory: IPA.search_deleter_dialog,
+                $factory: IPA.search_deleter_dialog
             },
             actions: [
                 {
@@ -337,8 +337,8 @@ return {
         ]
     },
     deleter_dialog: {
-        title: '@i18n:objects.trust.remove',
-    },
+        title: '@i18n:objects.trust.remove'
+    }
 };};
 
 IPA.trust.adder_dialog = function(spec) {
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index 3e434b4e6..2ae52847f 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -464,21 +464,21 @@ return {
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_group',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.user.remove_from_groups',
+            remove_title: '@i18n:objects.user.remove_from_groups'
         },
         {
             $type: 'association',
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.user.remove_from_netgroups',
+            remove_title: '@i18n:objects.user.remove_from_netgroups'
         },
         {
             $type: 'association',
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_role',
             associator: IPA.serial_associator,
-            remove_title: '@i18n:objects.user.remove_from_roles',
+            remove_title: '@i18n:objects.user.remove_from_roles'
         },
         {
             $type: 'association',
@@ -487,7 +487,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_user',
             remove_method: 'remove_user',
-            remove_title: '@i18n:objects.user.remove_from_hbac',
+            remove_title: '@i18n:objects.user.remove_from_hbac'
         },
         {
             $type: 'association',
@@ -496,7 +496,7 @@ return {
             associator: IPA.serial_associator,
             add_method: 'add_user',
             remove_method: 'remove_user',
-            remove_title: '@i18n:objects.user.remove_from_sudo',
+            remove_title: '@i18n:objects.user.remove_from_sudo'
         }
     ],
     standard_association_facets: {
diff --git a/install/ui/src/freeipa/vault.js b/install/ui/src/freeipa/vault.js
index 181b0fb41..6307e800c 100644
--- a/install/ui/src/freeipa/vault.js
+++ b/install/ui/src/freeipa/vault.js
@@ -89,7 +89,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.user'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_member_users',
+                        remove_title: '@i18n:objects.vault.remove_member_users'
                     },
                     {
                         $type: 'association_table',
@@ -103,7 +103,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.group'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_member_groups',
+                        remove_title: '@i18n:objects.vault.remove_member_groups'
                     },
                     {
                         $type: 'association_table',
@@ -118,7 +118,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.service'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_member_services',
+                        remove_title: '@i18n:objects.vault.remove_member_services'
                     }
                 ]
             },
@@ -141,7 +141,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.user'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_owner_users',
+                        remove_title: '@i18n:objects.vault.remove_owner_users'
                     },
                     {
                         $type: 'association_table',
@@ -157,7 +157,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.group'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_owner_groups',
+                        remove_title: '@i18n:objects.vault.remove_owner_groups'
                     },
                     {
                         $type: 'association_table',
@@ -174,7 +174,7 @@ var make_vaults_details_page_spec = function() {
                                 label: '@i18n:objects.vault.service'
                             }
                         ],
-                        remove_title: '@i18n:objects.vault.remove_owner_services',
+                        remove_title: '@i18n:objects.vault.remove_owner_services'
                     }
                 ]
             }
@@ -232,7 +232,7 @@ var make_my_vault_spec = function() {
             // I.e. facet with user vaults get column with name 'service', then
             // the value of 'service' column will be also added to command options.
             additional_table_attrs: ['username', 'service', 'shared'],
-            title: '@i18n:objects.vault.remove',
+            title: '@i18n:objects.vault.remove'
         }
     };
 
diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js
index 0d5e93a77..b3e342b83 100644
--- a/install/ui/src/freeipa/widget.js
+++ b/install/ui/src/freeipa/widget.js
@@ -4346,7 +4346,7 @@ IPA.attribute_table_widget = function(spec) {
         var dialog = IPA.deleter_dialog({
             entity: that.entity,
             values: selected_values,
-            title: title,
+            title: title
         });
 
         dialog.execute = function() {