diff --git a/lam-0.4/templates/account/groupedit.php b/lam-0.4/templates/account/groupedit.php
index fa1909b3..0c3d1c29 100644
--- a/lam-0.4/templates/account/groupedit.php
+++ b/lam-0.4/templates/account/groupedit.php
@@ -843,10 +843,12 @@ switch ($select_local) {
 		// Final Settings
 		echo '<input name="select" type="hidden" value="finish">';
 		echo "<fieldset class=\"groupedit-bright\"><legend class=\"groupedit-bright\"><b>"._('Note')."</b></legend>\n";
-		echo _('Group').' ';
-		echo $account_new->general_username;
-		if ($account_old) echo ' '._('has been modified').'.';
-		else echo ' '._('has been created').'.';
+		if ($account_old) {
+			printf(_("Group %s has been modified."), $account_new->general_username);
+		}
+		else {
+			printf(_("Group %s has been created."), $account_new->general_username);
+		}
 		echo "<br><br>";
 		if (!$account_old) {
 			echo '<input name="createagain" type="submit" value="'; echo _('Create another group'); echo '">';
diff --git a/lam-0.4/templates/account/hostedit.php b/lam-0.4/templates/account/hostedit.php
index a4b04706..13c63a4e 100644
--- a/lam-0.4/templates/account/hostedit.php
+++ b/lam-0.4/templates/account/hostedit.php
@@ -459,10 +459,12 @@ switch ($select_local) {
 		// Final Settings
 		echo '<input name="select" type="hidden" value="finish">';
 		echo "<fieldset class=\"hostedit-bright\"><legend class=\"hostedit-bright\"><b>"._('Note')."</b></legend>\n";
-		echo _('Host');
-		echo ' '.$account_new->general_username.' ';
-		if ($account_old) echo ' '._('has been modified').'.';
-		 else echo ' '._('has been created').'.';
+		if ($account_old) {
+			printf(_("Host %s has been modified."), $account_new->general_username);
+		}
+		else {
+			printf(_("Host %s has been created."), $account_new->general_username);
+		}
 		echo '<br><br>';
 		if (!$account_old) {
 			echo '<input name="createagain" type="submit" value="'; echo _('Create another host'); echo '">';
diff --git a/lam-0.4/templates/account/useredit.php b/lam-0.4/templates/account/useredit.php
index d020a35c..693b9d90 100644
--- a/lam-0.4/templates/account/useredit.php
+++ b/lam-0.4/templates/account/useredit.php
@@ -1564,10 +1564,12 @@ switch ($select_local) {
 		// Final Settings
 		echo '<input name="select" type="hidden" value="finish">';
 		echo "<fieldset class=\"groupedit-bright\"><legend class=\"useredit-bright\"><b>"._('Note')."</b></legend>\n";
-		echo _('User ');
-		echo $account_new->general_username;
-		if ($account_old) echo ' '._('has been modified').'.';
-		 else echo ' '._('has been created').'.';
+		if ($account_old) {
+			printf(_("User %s has been modified."), $account_new->general_username);
+		}
+		else {
+			printf(_("User %s has been created."), $account_new->general_username);
+		}
 		echo '<br><br>';
 		if (!$account_old) {
 			echo '<input name="createagain" type="submit" value="'; echo _('Create another user'); echo '">&nbsp;';