diff --git a/themes/default/register.tmpl.php b/themes/default/register.tmpl.php
index 36dc7b96..659fe577 100644
--- a/themes/default/register.tmpl.php
+++ b/themes/default/register.tmpl.php
@@ -75,7 +75,15 @@ function encrypt_password()
 	  
 	<dl class="form_layout">
 	  <dt><span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="login"><?php echo _AT('login_name'); ?></label>:</dt>
-	  <dd><input id="login" name="login" type="text" maxlength="20" size="30" value="<?php if (isset($_POST['login'])) echo stripslashes(htmlspecialchars($_POST['login'])); else echo stripslashes(htmlspecialchars($this->user_row['login'])); ?>" /></dd>
+	  <dd>
+	    <?php if($this->user_row['login'] != ''){
+	    echo '<strong>'.stripslashes(htmlspecialchars($this->user_row['login'])).'</strong>';
+	    }else{ ?>
+	    <input id="login" name="login" type="text" maxlength="20" size="30" value="<?php if (isset($_POST['login'])) echo stripslashes(htmlspecialchars($_POST['login'])); else echo stripslashes(htmlspecialchars($this->user_row['login'])); ?>" />
+	  <?php  }
+	    ?>
+
+	  </dd>
 		  <p><small>&middot; <?php echo _AT('contain_only'); ?><br />
 		  &middot; <?php echo _AT('20_max_chars'); ?></small></p>	
 
diff --git a/themes/default/user/index.tmpl.php b/themes/default/user/index.tmpl.php
index 0deda27a..216dec14 100644
--- a/themes/default/user/index.tmpl.php
+++ b/themes/default/user/index.tmpl.php
@@ -145,7 +145,7 @@
 			    id="rm<?php echo $row['user_id']; ?>">
 				<td><input type="checkbox" name="id[]" value="<?php echo $row['user_id']; ?>" id="m<?php echo $row['user_id']; ?>" 
 				           onmouseup="this.checked=!this.checked" onkeyup="this.checked=!this.checked" /></td>
-				<td><label for="m<?php echo $row['user_id']; ?>"><span class="inlineEdits" id="<?php echo "login-".$row['user_id']; ?>"><?php echo $row['login']; ?></span></label></td>
+				<td><label for="m<?php echo $row['user_id']; ?>"><?php echo $row['login']; ?></label></td>
 				<td><span class="inlineEdits" id="<?php echo "first_name-".$row['user_id']; ?>"><?php echo $row['first_name']; ?></span></td>
 				<td><span class="inlineEdits" id="<?php echo "last_name-".$row['user_id']; ?>"><?php echo $row['last_name']; ?></span></td>
 				<td><?php echo $row['user_group']; ?></td>