diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index ea95ad31..1b751f42 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -288,6 +288,7 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec
 			// Create automatic groupaccount with number if original user already exists
 			while ($temp = ldapexists($return, $type, $values_old)) {
 				// get last character of username
+				$return->general_username = substr($return->general_username, 0, $return->general_username-1);
 				$lastchar = substr($return->general_username, strlen($return->general_username)-2, 1);
 				// Last character is no number
 				if ( !ereg('^([0-9])+$', $lastchar))
@@ -304,6 +305,7 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec
 					$lastchars = substr($return->general_username, $i+1, strlen($return->general_username)-$i);
 					$return->general_username = $firstchars . (intval($lastchars)+1). '$';
 				 	}
+				$return->general_username = $return->general_username . "$";
 				}
 			if ($values->general_username != $return->general_username) $errors[] = array('WARN', _('Host name'), _('Hostname already in use. Selected next free hostname.'));
 			break;
diff --git a/lam/templates/account/hostedit.php b/lam/templates/account/hostedit.php
index 280c9b2d..fbf2b73d 100644
--- a/lam/templates/account/hostedit.php
+++ b/lam/templates/account/hostedit.php
@@ -176,7 +176,7 @@ do { // X-Or, only one if() can be true
 		break;
 		}
 	if ($_POST['backmain']) {
-		echo "<meta http-equiv=\"refresh\" content=\"2; URL=lists/listhosts.php\">\n";
+		echo "<meta http-equiv=\"refresh\" content=\"2; URL=../lists/listhosts.php\">\n";
 		$select_local='backmain';
 		break;
 		}
@@ -402,9 +402,6 @@ switch ($select_local) { // Select which part of page will be loaded
 		echo "<fieldset><legend><b>"._('Success')."</b></legend>\n";
 		echo "<table border=0 width=\"100%\"><tr><td>";
 		echo '<tr><td>';
-		echo _('Success');
-		echo '</td></tr>'."\n";
-		echo '<tr><td>';
 		echo _('Host');
 		echo ' '.$_SESSION['account']->general_username.' ';
 		if ($_SESSION['account_old']) echo ' '._('has been modified').'.';
@@ -418,7 +415,7 @@ switch ($select_local) { // Select which part of page will be loaded
 		break;
 	case 'backmain':
 		// unregister sessionvar and select which list should be shown
-		echo '<a href="lists/listhosts.php">';
+		echo '<a href="../lists/listhosts.php">';
 		echo _('Please press here if meta-refresh didn\'t work.');
 		echo "</a>\n";
 		if (isset($_SESSION['shelllist'])) unset($_SESSION['shelllist']);