diff --git a/common/framework/drivers/sms/twilio.php b/common/framework/drivers/sms/twilio.php
index 3c534a164..eefbd180a 100644
--- a/common/framework/drivers/sms/twilio.php
+++ b/common/framework/drivers/sms/twilio.php
@@ -43,7 +43,7 @@ class Twilio extends Base implements \Rhymix\Framework\Drivers\SMSInterface
 	/**
 	 * Config keys used by this driver are stored here.
 	 */
-	protected static $_required_config = ['api_key', 'api_secret'];
+	protected static $_required_config = ['account_sid', 'auth_token'];
 	protected static $_optional_config = [];
 
 	/**
@@ -70,9 +70,9 @@ class Twilio extends Base implements \Rhymix\Framework\Drivers\SMSInterface
 	public function send(array $messages, \Rhymix\Framework\SMS $original)
 	{
 		$status = true;
-		$url = sprintf('%s/Accounts/%s/Messages.json', self::BASEURL, $this->_config['api_key']);
+		$url = sprintf('%s/Accounts/%s/Messages.json', self::BASEURL, $this->_config['account_sid']);
 		$settings = [
-			'auth' => [$this->_config['api_key'], $this->_config['api_secret']],
+			'auth' => [$this->_config['account_sid'], $this->_config['auth_token']],
 			'timeout => 10',
 		];
 
diff --git a/modules/admin/tpl/config_notification.html b/modules/admin/tpl/config_notification.html
index 654685b9f..0bc2fb6ae 100644
--- a/modules/admin/tpl/config_notification.html
+++ b/modules/admin/tpl/config_notification.html
@@ -75,6 +75,8 @@
 			<!--@foreach($driver_definition['required'] as $conf_name)-->
 
 				{@ $conf_value = escape(config("mail.$driver_name.$conf_name"))}
+				{@ $text_keys = ['api_domain', 'api_user',  'api_key', 'api_token']}
+				{@ $password_keys = ['api_pass', 'api_secret']}
 
 				<!--@if($conf_name === 'smtp_host')-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
@@ -134,9 +136,9 @@
 
 				<!--@if($conf_name === 'api_type')-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_type">{$lang->cmd_advanced_mailer_api_type}</label>
+					<label class="x_control-label" for="mail_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys['api_type']}</label>
 					<div class="x_controls">
-						<select id="mail_{$driver_name}_api_type" name="mail_{$driver_name}_api_type">
+						<select id="mail_{$driver_name}_{$conf_name}" name="mail_{$driver_name}_{$conf_name}">
 							<!--@foreach($driver_definition['api_types'] as $api_type)-->
 								<option value="{$api_type}" selected="selected"|cond="$api_type === $conf_value">{$api_type}</option>
 							<!--@end-->
@@ -145,56 +147,20 @@
 				</div>
 				<!--@end-->
 
-				<!--@if($conf_name === 'api_domain')-->
+				<!--@if(in_array($conf_name, $text_keys))-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_domain">{$lang->cmd_advanced_mailer_api_domain}</label>
+					<label class="x_control-label" for="mail_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys[$conf_name]}</label>
 					<div class="x_controls">
-						<input type="text" name="mail_{$driver_name}_api_domain" id="mail_{$driver_name}_api_domain" value="{$conf_value}" />
+						<input type="text" name="mail_{$driver_name}_{$conf_name}" id="mail_{$driver_name}_{$conf_name}" value="{$conf_value}" />
 					</div>
 				</div>
 				<!--@end-->
 
-				<!--@if($conf_name === 'api_user')-->
+				<!--@if(in_array($conf_name, $password_keys))-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_user">{$lang->cmd_advanced_mailer_api_user}</label>
+					<label class="x_control-label" for="mail_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys[$conf_name]}</label>
 					<div class="x_controls">
-						<input type="text" name="mail_{$driver_name}_api_user" id="mail_{$driver_name}_api_user" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_pass')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_pass">{$lang->cmd_advanced_mailer_api_pass}</label>
-					<div class="x_controls full-width">
-						<input type="password" name="mail_{$driver_name}_api_pass" id="mail_{$driver_name}_api_pass" value="{$conf_value}" autocomplete="new-password" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_token')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_token">{$lang->cmd_advanced_mailer_api_token}</label>
-					<div class="x_controls full-width">
-						<input type="text" name="mail_{$driver_name}_api_token" id="mail_{$driver_name}_api_token" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_key')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_key">{$lang->cmd_advanced_mailer_api_key}</label>
-					<div class="x_controls">
-						<input type="text" name="mail_{$driver_name}_api_key" id="mail_{$driver_name}_api_key" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_secret')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="mail_{$driver_name}_api_secret">{$lang->cmd_advanced_mailer_api_secret}</label>
-					<div class="x_controls">
-						<input type="password" name="mail_{$driver_name}_api_secret" id="mail_{$driver_name}_api_secret" value="{$conf_value}" autocomplete="new-password" />
+						<input type="password" name="mail_{$driver_name}_{$conf_name}" id="mail_{$driver_name}_{$conf_name}" value="{$conf_value}" autocomplete="new-password" />
 					</div>
 				</div>
 				<!--@end-->
@@ -244,22 +210,15 @@
 			<!--@foreach($conf_names as $conf_name)-->
 
 				{@ $conf_value = escape(config("sms.$driver_name.$conf_name"))}
-
-				<!--@if($conf_name === 'service_id')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_service_id">{$lang->cmd_advanced_mailer_service_id}</label>
-					<div class="x_controls">
-						<input type="text" name="sms_{$driver_name}_service_id" id="sms_{$driver_name}_service_id" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
+				{@ $text_keys = ['service_id', 'account_sid', 'api_user',  'api_key', 'api_token']}
+				{@ $password_keys = ['api_pass', 'api_secret', 'auth_token']}
 
 				<!--@if($conf_name === 'api_url')-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_key">{$lang->cmd_advanced_mailer_api_url}</label>
+					<label class="x_control-label" for="sms_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys['api_url']}</label>
 					<div class="x_controls">
 						{@ $conf_exists = config("sms.$driver_name.api_key")}
-						<select type="select" name="sms_{$driver_name}_api_url" id="sms_{$driver_name}_api_url">
+						<select type="select" name="sms_{$driver_name}_{$conf_name}" id="sms_{$driver_name}_{$conf_name}">
 							<!--@foreach($driver_definition['api_urls'] as $api_url => $api_url_name)-->
 								<option value="{$api_url}" selected="selected"|cond="$conf_value === $api_url || (!$conf_value && $conf_exists && $api_url === array_last_key($driver_definition['api_urls']))">{$api_url_name}</option>
 							<!--@endforeach-->
@@ -268,56 +227,29 @@
 				</div>
 				<!--@end-->
 
-				<!--@if($conf_name === 'api_user')-->
+				<!--@if(in_array($conf_name, $text_keys))-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_user">{$lang->cmd_advanced_mailer_api_user}</label>
+					<label class="x_control-label" for="sms_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys[$conf_name]}</label>
 					<div class="x_controls">
-						<input type="text" name="sms_{$driver_name}_api_user" id="sms_{$driver_name}_api_user" value="{$conf_value}" />
+						<input type="text" name="sms_{$driver_name}_{$conf_name}" id="sms_{$driver_name}_{$conf_name}" value="{$conf_value}" />
 					</div>
 				</div>
 				<!--@end-->
 
-				<!--@if($conf_name === 'api_pass')-->
+				<!--@if(in_array($conf_name, $password_keys))-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_pass">{$lang->cmd_advanced_mailer_api_pass}</label>
-					<div class="x_controls full-width">
-						<input type="password" name="sms_{$driver_name}_api_pass" id="sms_{$driver_name}_api_pass" value="{$conf_value}" autocomplete="new-password" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_token')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_token">{$lang->cmd_advanced_mailer_api_token}</label>
-					<div class="x_controls full-width">
-						<input type="text" name="sms_{$driver_name}_api_token" id="sms_{$driver_name}_api_token" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_key')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_key">{$lang->cmd_advanced_mailer_api_key}</label>
+					<label class="x_control-label" for="sms_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys[$conf_name]}</label>
 					<div class="x_controls">
-						<input type="text" name="sms_{$driver_name}_api_key" id="sms_{$driver_name}_api_key" value="{$conf_value}" />
-					</div>
-				</div>
-				<!--@end-->
-
-				<!--@if($conf_name === 'api_secret')-->
-				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_api_secret">{$lang->cmd_advanced_mailer_api_secret}</label>
-					<div class="x_controls">
-						<input type="password" name="sms_{$driver_name}_api_secret" id="sms_{$driver_name}_api_secret" value="{$conf_value}" autocomplete="new-password" />
+						<input type="password" name="sms_{$driver_name}_{$conf_name}" id="sms_{$driver_name}_{$conf_name}" value="{$conf_value}" autocomplete="new-password" />
 					</div>
 				</div>
 				<!--@end-->
 
 				<!--@if($conf_name === 'sender_key')-->
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
-					<label class="x_control-label" for="sms_{$driver_name}_sender_key">{$lang->cmd_advanced_mailer_sender_key}</label>
+					<label class="x_control-label" for="sms_{$driver_name}_{$conf_name}">{$lang->cmd_advanced_mailer_config_keys['sender_key']}</label>
 					<div class="x_controls">
-						<input type="password" name="sms_{$driver_name}_sender_key" id="sms_{$driver_name}_sender_key" value="{$conf_value}" autocomplete="new-password" />
+						<input type="password" name="sms_{$driver_name}_{$conf_name}" id="sms_{$driver_name}_{$conf_name}" value="{$conf_value}" autocomplete="new-password" />
 						<p class="x_help-block">{$lang->cmd_admin_sms_sender_key_help}</p>
 					</div>
 				</div>
diff --git a/modules/advanced_mailer/lang/en.php b/modules/advanced_mailer/lang/en.php
index ce5b7fa5e..783d8cc35 100644
--- a/modules/advanced_mailer/lang/en.php
+++ b/modules/advanced_mailer/lang/en.php
@@ -28,24 +28,26 @@ $lang->cmd_advanced_mailer_smtp_security_tls = 'TLS (STARTTLS)';
 $lang->cmd_advanced_mailer_smtp_security_none = 'None';
 $lang->cmd_advanced_mailer_smtp_user = 'Username';
 $lang->cmd_advanced_mailer_smtp_pass = 'Password';
-$lang->cmd_advanced_mailer_service_id = 'Service ID';
-$lang->cmd_advanced_mailer_api_url = 'API URL';
-$lang->cmd_advanced_mailer_api_key = 'API key';
-$lang->cmd_advanced_mailer_api_secret = 'API secret';
-$lang->cmd_advanced_mailer_api_domain = 'Domain';
-$lang->cmd_advanced_mailer_api_token = 'API token';
-$lang->cmd_advanced_mailer_api_type = 'API type';
-$lang->cmd_advanced_mailer_api_type_free = 'Free account';
-$lang->cmd_advanced_mailer_api_type_paid = 'Paid account';
-$lang->cmd_advanced_mailer_api_user = 'Username';
-$lang->cmd_advanced_mailer_api_pass = 'Password';
+$lang->cmd_advanced_mailer_config_keys['service_id'] = 'Service ID';
+$lang->cmd_advanced_mailer_config_keys['account_sid'] = 'Account SID';
+$lang->cmd_advanced_mailer_config_keys['auth_token'] = 'Auth token';
+$lang->cmd_advanced_mailer_config_keys['api_url'] = 'API URL';
+$lang->cmd_advanced_mailer_config_keys['api_key'] = 'API key';
+$lang->cmd_advanced_mailer_config_keys['api_secret'] = 'API secret';
+$lang->cmd_advanced_mailer_config_keys['api_domain'] = 'Domain';
+$lang->cmd_advanced_mailer_config_keys['api_token'] = 'API token';
+$lang->cmd_advanced_mailer_config_keys['api_type'] = 'API type';
+$lang->cmd_advanced_mailer_config_keys['api_type_free'] = 'Free account';
+$lang->cmd_advanced_mailer_config_keys['api_type_paid'] = 'Paid account';
+$lang->cmd_advanced_mailer_config_keys['api_user'] = 'Username';
+$lang->cmd_advanced_mailer_config_keys['api_pass'] = 'Password';
+$lang->cmd_advanced_mailer_config_keys['sender_key'] = 'Sender key';
 $lang->cmd_advanced_mailer_fcm_api_key = 'FCM Legacy API key';
 $lang->cmd_advanced_mailer_fcm_service_account = 'FCM service account file';
 $lang->cmd_advanced_mailer_apns_certificate = 'APNs certificate file';
 $lang->cmd_advanced_mailer_apns_passphrase = 'APNs certificate passphrase';
 $lang->cmd_advanced_mailer_allow_guest_device = 'Register Guest Devices';
 $lang->cmd_advanced_mailer_about_allow_guest_device = 'Accept device registrations from users who are not logged in.';
-$lang->cmd_advanced_mailer_sender_key = 'Sender key';
 $lang->cmd_advanced_mailer_sender_identity = 'Sender Identity';
 $lang->cmd_advanced_mailer_about_sender_identity = 'You can change the sender\'s name and e-mail address in the <a href="' . \RX_BASEURL . 'index.php?module=admin&act=dispAdminConfigNotification" target="_blank">Notification Settings</a> screen.';
 $lang->cmd_advanced_mailer_sender_name = 'Sender\'s name';
diff --git a/modules/advanced_mailer/lang/ko.php b/modules/advanced_mailer/lang/ko.php
index 8e3f90a2c..e12ee7712 100644
--- a/modules/advanced_mailer/lang/ko.php
+++ b/modules/advanced_mailer/lang/ko.php
@@ -28,24 +28,26 @@ $lang->cmd_advanced_mailer_smtp_security_tls = 'TLS (STARTTLS)';
 $lang->cmd_advanced_mailer_smtp_security_none = '사용하지 않음';
 $lang->cmd_advanced_mailer_smtp_user = '아이디';
 $lang->cmd_advanced_mailer_smtp_pass = '비밀번호';
-$lang->cmd_advanced_mailer_service_id = '서비스 ID';
-$lang->cmd_advanced_mailer_api_url = 'API URL';
-$lang->cmd_advanced_mailer_api_key = 'API 키';
-$lang->cmd_advanced_mailer_api_secret = 'API 비밀';
-$lang->cmd_advanced_mailer_api_domain = '도메인';
-$lang->cmd_advanced_mailer_api_token = 'API 토큰';
-$lang->cmd_advanced_mailer_api_type = 'API 구분';
-$lang->cmd_advanced_mailer_api_type_free = '무료';
-$lang->cmd_advanced_mailer_api_type_paid = '유료';
-$lang->cmd_advanced_mailer_api_user = '아이디';
-$lang->cmd_advanced_mailer_api_pass = '비밀번호';
+$lang->cmd_advanced_mailer_config_keys['service_id'] = '서비스 ID';
+$lang->cmd_advanced_mailer_config_keys['account_sid'] = '계정 SID';
+$lang->cmd_advanced_mailer_config_keys['auth_token'] = '인증 토큰';
+$lang->cmd_advanced_mailer_config_keys['api_url'] = 'API URL';
+$lang->cmd_advanced_mailer_config_keys['api_key'] = 'API 키';
+$lang->cmd_advanced_mailer_config_keys['api_secret'] = 'API 비밀';
+$lang->cmd_advanced_mailer_config_keys['api_domain'] = '도메인';
+$lang->cmd_advanced_mailer_config_keys['api_token'] = 'API 토큰';
+$lang->cmd_advanced_mailer_config_keys['api_type'] = 'API 구분';
+$lang->cmd_advanced_mailer_config_keys['api_type_free'] = '무료';
+$lang->cmd_advanced_mailer_config_keys['api_type_paid'] = '유료';
+$lang->cmd_advanced_mailer_config_keys['api_user'] = '아이디';
+$lang->cmd_advanced_mailer_config_keys['api_pass'] = '비밀번호';
+$lang->cmd_advanced_mailer_config_keys['sender_key'] = '센더 키';
 $lang->cmd_advanced_mailer_fcm_api_key = 'FCM Legacy API 키';
 $lang->cmd_advanced_mailer_fcm_service_account = 'FCM 서비스 계정 파일';
 $lang->cmd_advanced_mailer_apns_certificate = 'APNs 인증서 파일';
 $lang->cmd_advanced_mailer_apns_passphrase = 'APNs 인증서 암호';
 $lang->cmd_advanced_mailer_allow_guest_device = '비회원 기기 등록';
 $lang->cmd_advanced_mailer_about_allow_guest_device = '로그인하지 않은 사용자도 기기를 등록할 수 있도록 허용합니다.';
-$lang->cmd_advanced_mailer_sender_key = '센더 키';
 $lang->cmd_advanced_mailer_sender_identity = '보낸이 설정';
 $lang->cmd_advanced_mailer_about_sender_identity = '보낸이의 이름과 메일 주소는 <a href="' . \RX_BASEURL . 'index.php?module=admin&act=dispAdminConfigNotification" target="_blank">알림 설정</a> 화면에서 변경할 수 있습니다.';
 $lang->cmd_advanced_mailer_sender_name = '보낸이 이름';