diff --git a/i18n/en-US.json b/i18n/en-US.json
index 315eddb..47a06ac 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -433,7 +433,8 @@
 			"form": {
 				"label": {
 					"callerId": "Faxbox number",
-					"linkToPrinter": "Link to printer"
+					"linkToPrinter": "Link to printer",
+					"smtpEmailAddress": "SMTP email address"
 				}
 			},
 			"defaultSettings": {
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index 3c4f26d..b35ce07 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -413,7 +413,8 @@
 			"form": {
 				"label": {
 					"callerId": "Numéro de Faxbox",
-					"linkToPrinter": "Lien de l'imprimante"
+					"linkToPrinter": "Lien de l'imprimante",
+					"smtpEmailAddress": "Adresse email SMTP"
 				}
 			},
 			"defaultSettings": {
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 96635fa..c3f8623 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -727,7 +727,8 @@
 	margin-bottom: 0;
 }
 
-.feature-popup-container[data-feature="faxing"] #printer_link {
+.feature-popup-container[data-feature="faxing"] #printer_link,
+.feature-popup-container[data-feature="faxing"] .controls span.text {
 	margin-left: 10px;
 	line-height: 30px;
 }
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html
index a7fca75..de6ae1b 100644
--- a/views/users-feature-faxing.html
+++ b/views/users-feature-faxing.html
@@ -26,7 +26,7 @@
 					</select>
 				</div>
 			</div>
-		{{#if faxbox.cloud_connector_claim_url}}
+		{{#if faxbox.cloud_state}}
 			<div class="control-group">
 				<label for="printer_link" class="control-label">{{ i18n.users.faxing.form.label.linkToPrinter }}</label>
 				<div class="controls">
@@ -34,6 +34,14 @@
 				</div>
 			</div>
 		{{/if}}
+		{{#if faxbox.smtp_email_address}}
+			<div class="control-group">
+				<label for="stmp_email_address" class="control-label">{{ i18n.users.faxing.form.label.smtpEmailAddress }}</label>
+				<div class="controls">
+					<span class="text">{{faxbox.smtp_email_address}}</span>
+				</div>
+			</div>
+		{{/if}}
 		</form>
 		<div class="help-box gray-box">
 			<div class="wrapper-icon">