diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index ca00977..632d4f0 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -1,7 +1,6 @@
 define(function(require){
 	var $ = require('jquery'),
 		_ = require('underscore'),
-		mask = require('mask'),
 		monster = require('monster'),
 		toastr = require('toastr');
 
@@ -359,7 +358,8 @@ define(function(require){
 			monster.ui.protectField(templateDevice.find('#sip_password'), templateDevice);
 
 			monster.ui.tooltips(templateDevice);
-			templateDevice.find('#mac_address').mask('FF:FF:FF:FF:FF:FF', {translation: {"F": { pattern:/[A-Fa-f0-9]/ }}});
+			monster.ui.mask(templateDevice.find('#mac_address'), 'macAddress');
+			monster.ui.mask(templateDevice.find('[name="call_forward.number"]'), 'phoneNumber');
 			templateDevice.find('.chosen-feature-key-user').chosen({ search_contains: true, width: 'inherit' });
 
 			if(!(data.media.encryption.enforce_security)) {
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 682d4ab..68eeae9 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -274,8 +274,7 @@ define(function(require){
 						groupForm = groupTemplate.find('#form_group_creation');
 
 					monster.ui.validate(groupForm);
-
-					groupForm.find('#inputExtension').mask('99ZZZZZZZZZZZZZZ', {translation:  {'Z': {pattern: /[0-9]/, optional: true}}});
+					monster.ui.mask(groupForm.find('#inputExtension'), 'extension');
 
 					groupTemplate.find('#create_group').on('click', function() {
 						if(monster.ui.valid(groupForm)) {
@@ -1250,7 +1249,7 @@ define(function(require){
 						newLineTemplate = $(monster.template(self, 'groups-newExtension', dataTemplate)),
 						$listExtensions = template.find('.list-assigned-items');
 
-					newLineTemplate.find('.input-extension').mask('99ZZZZZZZZZZZZZZ', {translation:  {'Z': {pattern: /[0-9]/, optional: true}}});
+					monster.ui.mask(newLineTemplate.find('.input-extension'), 'extension');
 
 					listExtension.push(lastExtension);
 					$listExtensions.find('.empty-row').hide();
diff --git a/submodules/users/users.js b/submodules/users/users.js
index c1c5df9..d8d779a 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -587,7 +587,7 @@ define(function(require){
 						var originalData = self.usersFormatAddUser(results),
 							userTemplate = $(monster.template(self, 'users-creation', originalData));
 
-						userTemplate.find('#extension').mask('99ZZZZZZZZZZZZZZ', {translation:  {'Z': {pattern: /[0-9]/, optional: true}}});
+						monster.ui.mask(userTemplate.find('#extension'), 'extension');
 
 						monster.ui.validate(userTemplate.find('#form_user_creation'), {
 							rules: {
@@ -719,7 +719,7 @@ define(function(require){
 					newLineTemplate = $(monster.template(self, 'users-newExtension', dataTemplate)),
 					listExtensions = template.find('.extensions .list-assigned-items');
 
-				newLineTemplate.find('.input-extension ').mask('99ZZZZZZZZZZZZZZ', {translation:  {'Z': {pattern: /[0-9]/, optional: true}}});
+				monster.ui.mask(newLineTemplate.find('.input-extension '), 'extension');
 
 				listExtensions.find('.empty-row').hide();
 
@@ -1925,6 +1925,8 @@ define(function(require){
 				},
 				timeoutWarningBox = featureTemplate.find('.help-box.red-box');
 
+			monster.ui.mask(featureTemplate.find('#number'), 'phoneNumber');
+
 			if(currentUser.hasOwnProperty('call_forward') && currentUser.call_forward.require_keypress) {
 				timeoutWarningBox.hide();
 			}