diff --git a/core/upgrade/app_defaults.php b/core/upgrade/app_defaults.php
index 5248a0f758..2891c311ff 100644
--- a/core/upgrade/app_defaults.php
+++ b/core/upgrade/app_defaults.php
@@ -74,6 +74,48 @@ if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
 					unset($sql);
 				}
 			}
+
+		//ensure the login message is set
+			$sql = "delete from v_default_settings ";
+			$sql .= "where default_setting_category = 'login' ";
+			$sql .= "and default_setting_subcategory = 'message' ";
+			$db->exec(check_sql($sql));
+			unset($sql);
+
+			$sql = "select count(*) as num_rows from v_default_settings ";
+			$sql .= "where default_setting_category = 'login' ";
+			$sql .= "and default_setting_subcategory = 'message' ";
+			$sql .= "and default_setting_name = 'text' ";
+			$prep_statement = $db->prepare($sql);
+			if ($prep_statement) {
+				$prep_statement->execute();
+				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+				if ($row['num_rows'] == 0) {
+					$sql = "insert into v_default_settings ";
+					$sql .= "(";
+					$sql .= "default_setting_uuid, ";
+					$sql .= "default_setting_category, ";
+					$sql .= "default_setting_subcategory, ";
+					$sql .= "default_setting_name, ";
+					$sql .= "default_setting_value, ";
+					$sql .= "default_setting_enabled, ";
+					$sql .= "default_setting_description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'".uuid()."', ";
+					$sql .= "'login', ";
+					$sql .= "'message', ";
+					$sql .= "'text', ";
+					$sql .= "'".$text['login-message_text']."', ";
+					$sql .= "'true', ";
+					$sql .= "'' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+				}
+			}
+
 	}
 }
 
diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php
index 4643f95ce6..3b1bff34b3 100644
--- a/core/upgrade/app_languages.php
+++ b/core/upgrade/app_languages.php
@@ -79,4 +79,10 @@
 	$text['message-upgrade']['es-cl'] = "Actualización Completa";
 	$text['message-upgrade']['pt-pt'] = "Actualização Efectuada";
 	$text['message-upgrade']['fr-fr'] = "Mis à jour";
+
+	$text['login-message_text']['en-us'] = "Keep up with the FusionPBX project by configuring your preferences in the newly added <a href=''/app/notifications/notification_edit.php''>Notifications</a> section, under the System menu!";
+	$text['login-message_text']['es-cl'] = "Manténgase al día con el proyecto FusionPBX configurando sus preferencias en la sección <a href=''/app/notifications/notification_edit.php''>Notificaciones</a> acaba de agregar, en el menú del sistema!";
+	$text['login-message_text']['pt-pt'] = "Mantenha-se com o projeto FusionPBX configurando suas preferências na seção <a href=''/app/notifications/notification_edit.php''>Notificações</a> recém-adicionado, no menu Sistema!";
+	$text['login-message_text']['fr-fr'] = "Tenez-vous au projet FusionPBX en configurant vos préférences dans la section <a href=''/app/notifications/notification_edit.php''>Notifications</a> nouvellement ajouté, dans le menu du système!";
+
 ?>
diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index 96c6cea6d1..cd66881033 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -169,4 +169,14 @@
 	$text['label-dnd']['es-cl'] = "No Molestar";
 	$text['label-dnd']['pt-pt'] = "Não Perturbar";
 	$text['label-dnd']['fr-fr'] = "Ne Pas Déranger";
+
+	$text['login-message_attention']['en-us'] = "Attention!";
+	$text['login-message_attention']['es-cl'] = "¡Atención!";
+	$text['login-message_attention']['pt-pt'] = "Atenção!";
+	$text['login-message_attention']['fr-fr'] = "Attention!";
+
+	$text['login-message_dismiss']['en-us'] = "Dismiss";
+	$text['login-message_dismiss']['es-cl'] = "Despedir";
+	$text['login-message_dismiss']['pt-pt'] = "Demitir";
+	$text['login-message_dismiss']['fr-fr'] = "Rejeter";
 ?>
diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php
index 82bd4127aa..1be06f754c 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -52,15 +52,25 @@
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-//information
-	//echo "<table width=\"100%\" border=\"0\" cellpadding=\"7\" cellspacing=\"0\">\n";
-	//echo "  <tr>\n";
-	//echo "	<td align='left'><b>Information</b><br>\n";
-	//echo "		The following links are for convenience access to the user account settings, and voicemail.<br />\n";
-	//echo "	</td>\n";
-	//echo "  </tr>\n";
-	//echo "</table>\n";
-	//echo "<br />\n";
+//disable login message
+	if ($_GET['msg'] == 'dismiss') {
+		unset($_SESSION['login']['message']['text']);
+
+		$sql = "update v_default_settings ";
+		$sql .= "set default_setting_enabled = 'false' ";
+		$sql .= "where ";
+		$sql .= "default_setting_category = 'login' ";
+		$sql .= "and default_setting_subcategory = 'message'";
+		$db->exec(check_sql($sql));
+		unset($sql);
+	}
+
+//display login message
+	if (if_group("superadmin") && $_SESSION['login']['message']['text'] != '') {
+		echo "<br />";
+		echo "<br />";
+		echo "<div class='login_message' width='100%'><b>".$text['login-message_attention']."</b>&nbsp;&nbsp;".$_SESSION['login']['message']['text']."&nbsp;&nbsp;(<a href='?msg=dismiss'>".$text['login-message_dismiss']."</a>)</div>";
+	}
 
 //start the user table
 	echo "<br />";
diff --git a/themes/accessible/template.php b/themes/accessible/template.php
index 27120de03f..1d3f38ed6f 100644
--- a/themes/accessible/template.php
+++ b/themes/accessible/template.php
@@ -435,6 +435,15 @@ table tr:last-child td:last-child {
 		color: #fff;
 	}
 
+	DIV.login_message {
+		border: 1px solid #bae0ba;
+		background-color: #eeffee;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
+		border-radius: 3px 3px 3px 3px;
+		padding: 20px;
+		}
+
 </style>
 
 <script type="text/javascript">
diff --git a/themes/classic/template.php b/themes/classic/template.php
index 3cdbb73631..f3e491b3c9 100644
--- a/themes/classic/template.php
+++ b/themes/classic/template.php
@@ -533,6 +533,15 @@ table tr:nth-last-child(-5) td:first-of-type {
 		color: #fff;
 	}
 
+	DIV.login_message {
+		border: 1px solid #bae0ba;
+		background-color: #eeffee;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
+		border-radius: 3px 3px 3px 3px;
+		padding: 20px;
+		}
+
 </style>
 
 <script type="text/javascript">
diff --git a/themes/default/template.php b/themes/default/template.php
index eb6824065b..e053df5e9f 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -594,6 +594,15 @@ table tr:nth-last-child(-5) td:first-of-type {
 		color: #fff;
 	}
 
+	DIV.login_message {
+		border: 1px solid #bae0ba;
+		background-color: #eeffee;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
+		border-radius: 3px 3px 3px 3px;
+		padding: 20px;
+		}
+
 </style>
 <style type="text/css">
 	/* Remove margins from the 'html' and 'body' tags, and ensure the page takes up full screen height */
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 444122e166..0f3a34b2bc 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -757,6 +757,15 @@ legend {
 		}
 
 
+	DIV.login_message {
+		border: 1px solid #bae0ba;
+		background-color: #eeffee;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
+		border-radius: 3px 3px 3px 3px;
+		padding: 20px;
+		}
+
 </style>
 
 <script type="text/javascript">
diff --git a/themes/nature/template.php b/themes/nature/template.php
index 4cb050a8b7..53fdfd77ca 100644
--- a/themes/nature/template.php
+++ b/themes/nature/template.php
@@ -674,6 +674,16 @@ table tr:nth-last-child(-5) td:first-of-type {
 		font-weight: bold;
 		color: #fff;
 	}
+
+	DIV.login_message {
+		border: 1px solid #bae0ba;
+		background-color: #eeffee;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
+		border-radius: 3px 3px 3px 3px;
+		padding: 20px;
+		}
+
 </style>
 
 <script type="text/javascript">