diff --git a/e107_admin/users.php b/e107_admin/users.php
index 8840448ea..ac250740c 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1625,7 +1625,7 @@ class users_admin_ui extends e_admin_ui
 		<tr>
 			<td>".USRLAN_128."</td>
 			<td ><div class='form-inline'>
-			".$frm->text('loginname', varset($user_data['user_loginname']), varset($pref['loginname_maxlength'], 30), array('size'=>'xlarge'))."&nbsp;&nbsp;
+			".$frm->text('loginname', varset($user_data['user_loginname']), varset($pref['loginname_maxlength'], 30), array('size'=>'xlarge', 'required'=>1))."&nbsp;&nbsp;
 			".$frm->checkbox_label(USRLAN_170, 'generateloginname', 1, varset($pref['predefinedLoginName'], false))."
 			</div></td>
 		</tr>
diff --git a/e107_tests/tests/unit/plugins/linkwords/e_tohtml_linkwordsTest.php b/e107_tests/tests/unit/plugins/linkwords/e_tohtml_linkwordsTest.php
index 0739ecad5..5d5b32625 100644
--- a/e107_tests/tests/unit/plugins/linkwords/e_tohtml_linkwordsTest.php
+++ b/e107_tests/tests/unit/plugins/linkwords/e_tohtml_linkwordsTest.php
@@ -101,6 +101,24 @@
 			}
 
 		}
+
+		function testToHTMLWordLimit()
+		{
+			$text1 = "<p>here is text link</p>";
+			$text2 = "<p>and another link text</p>";
+			$text3 = "<p>and another paragraph of text with a link</p>";
+			$text4 = "<p>and yet another link to do</p>";
+
+			$this->lw->toHTML($text1, 'BODY');
+			$this->lw->toHTML($text2, 'BODY');
+			$result1 = $this->lw->toHTML($text3, 'BODY');
+			$result2 = $this->lw->toHTML($text4, 'BODY');
+
+			$this->assertSame('<p>and another paragraph of text with a <a class="lw-link  lw-3"  href="/page-link" >link</a></p>', $result1);
+			$this->assertSame('<p>and yet another link to do</p>', $result2);
+
+
+		}
 /*
 		public function testLinksproc()
 		{