diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 384a0778bb2..fda4e2d997e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.quiesce.vm=Quiesce VM
+label.smb.username=SMB Username
+label.smb.password=SMB Password
+label.smb.domain=SMB Domain
 label.hypervisors=Hypervisors
 label.home=Home
 label.sockets=Sockets
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index c870f12a90e..8e75969906c 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,10 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script type="text/javascript">
 dictionary = {
+'label.quiesce.vm': '<fmt:message key="label.quiesce.vm" />',
+'label.smb.username': '<fmt:message key="label.smb.username" />',
+'label.smb.password': '<fmt:message key="label.smb.password" />',
+'label.smb.domain': '<fmt:message key="label.smb.domain" />',
 'label.hypervisors': '<fmt:message key="label.hypervisors" />',
 'label.home': '<fmt:message key="label.home" />',
 'label.sockets': '<fmt:message key="label.sockets" />',
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 2b265292915..5300a54710a 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -43,7 +43,7 @@
                         isChecked: false
                     },
                     quiescevm: {
-                        label: 'Quiesce VM',
+                        label: 'label.quiesce.vm',
                         isBoolean: true,
                         isChecked: false
                     }
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 86f7aa0ca06..ec91a5d72c8 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -576,7 +576,7 @@
                                     desc: 'message.action.take.snapshot',
                                     fields: {
                                         quiescevm: {
-                                            label: 'Quiesce VM',
+                                            label: 'label.quiesce.vm',
                                             isBoolean: true,
                                             isHidden: function(args) {
                                                 var hidden = true;
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6fdb51f3623..f4b038811e5 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -15040,14 +15040,14 @@
 
                                     //SMB                                           
                                     smbUsername: {
-                                    	label: 'SMB Username',
+                                    	label: 'label.smb.username',
                                     	validation: {
                                             required: true
                                         },
                                         isHidden: true
                                     },
                                     smbPassword: {
-                                    	label: 'SMB Password',
+                                    	label: 'label.smb.password',
                                     	isPassword: true,
                                     	validation: {
                                             required: true
@@ -15055,7 +15055,7 @@
                                         isHidden: true
                                     },
                                     smbDomain: {
-                                    	label: 'SMB Domain',
+                                    	label: 'label.smb.domain',
                                     	validation: {
                                             required: true
                                         },
@@ -16410,20 +16410,20 @@
                                             
                                             //SMB (begin)                                            
                                             smbUsername: {
-                                            	label: 'SMB Username',
+                                            	label: 'label.smb.username',
                                             	validation: {
                                                     required: true
                                                 }
                                             },
                                             smbPassword: {
-                                            	label: 'SMB Password',
+                                            	label: 'label.smb.password',
                                             	isPassword: true,
                                             	validation: {
                                                     required: true
                                                 }
                                             },
                                             smbDomain: {
-                                            	label: 'SMB Domain',
+                                            	label: 'label.smb.domain',
                                             	validation: {
                                                     required: true
                                                 }
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 15fb6a73d4b..13630c14efd 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1747,14 +1747,14 @@
 
                     //SMB                                           
                     smbUsername: {
-                    	label: 'SMB Username',
+                    	label: 'label.smb.username',
                     	validation: {
                             required: true
                         },
                         isHidden: true
                     },
                     smbPassword: {
-                    	label: 'SMB Password',
+                    	label: 'label.smb.password',
                     	isPassword: true,
                     	validation: {
                             required: true
@@ -1762,7 +1762,7 @@
                         isHidden: true
                     },
                     smbDomain: {
-                    	label: 'SMB Domain',
+                    	label: 'label.smb.domain',
                     	validation: {
                             required: true
                         },