diff --git a/i18n/en-US.json b/i18n/en-US.json
index e548563..1f1b68f 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -354,7 +354,10 @@
 			"sendToDifferentEmail": "Send emails to an alternate address",
 			"title": "Create User",
 			"vmboxAlreadyExist": "VMBox Number is already taken, please choose a different Voicemail Box Number.",
-			"vmboxNumber": "VM Box #"
+			"vmboxNumber": "VM Box #",
+			"__comment": "UI-814: Adding the option to automatically send email on user creation",
+			"__version": "3.20_s3",
+			"sendWelcomeEmail": "Send credentials to this user"
 		},
 		"editionForm": {
 			"changePIN": "Change PIN",
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index 118ecfa..dc47201 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -329,7 +329,8 @@
 			"sendToDifferentEmail": "Envoyer les emails à une autre adresse",
 			"title": "Créer Utilisateur",
 			"vmboxAlreadyExist": "Le numéro de répondeur existe déjà, veuillez en choisir un autre.",
-			"vmboxNumber": "Numéro Répondeur"
+			"vmboxNumber": "Numéro Répondeur",
+			"sendWelcomeEmail": "Envoyer les informations de connexion à cet utilisateur"
 		},
 		"editionForm": {
 			"changePIN": "Changer PIN",
diff --git a/views/users-creation.html b/views/users-creation.html
index 9c84bbb..d8400af 100644
--- a/views/users-creation.html
+++ b/views/users-creation.html
@@ -59,6 +59,15 @@
 				<input type="email" name="extra.email" id="email" placeholder="{{i18n.users.dialogCreationUser.notificationEmail}}">
 			</div>
 		</div>
+		<div class="control-group hack-left">
+			<label class="control-label" for="send_email_on_creation"></label>
+			<div class="controls">
+				<label>
+					<input id="send_email_on_creation" type="checkbox" name="user.send_email_on_creation"></input>
+					{{ i18n.users.dialogCreationUser.sendWelcomeEmail }}
+				</label>
+			</div>
+		</div>
 	</div>
 	</form>
 	<div class="dialog-buttons-wrapper">