diff --git a/public/templates/mmcFE/global/login.tpl b/public/templates/mmcFE/global/login.tpl
index d411d39a..363f403e 100644
--- a/public/templates/mmcFE/global/login.tpl
+++ b/public/templates/mmcFE/global/login.tpl
@@ -1,7 +1,7 @@
 {include file="global/block_header.tpl" BLOCK_HEADER="Login" BLOCK_STYLE="clear:none; margin-left:13px;  margin-top:15px;"}        
 	<form action="{$smarty.server.PHP_SELF}?page=login" method="post" id="loginForm">
-          <p><input type="text" name="username" value="" id="userForm" maxlength="20"></p>
-          <p><input type="password" name="password" value="" id="passForm" maxlength="20"></p>
+          <p><input type="text" name="username" value="" id="userForm" maxlength="20" required></p>
+          <p><input type="password" name="password" value="" id="passForm" maxlength="20" required></p>
           <center><p><input type="submit" class="submit small" value="Login"></p></center>
         </form>
         <center><p><a href="{$smarty.server.PHP_SELF}?page=password"><font size="1">Forgot your password?</font></a></p></center>
diff --git a/public/templates/mmcFE/register/default.tpl b/public/templates/mmcFE/register/default.tpl
index f711c67f..94cdf0f8 100644
--- a/public/templates/mmcFE/register/default.tpl
+++ b/public/templates/mmcFE/register/default.tpl
@@ -4,11 +4,11 @@
   <input type="hidden" name="action" value="register">
   <table width="90%" border="0">
     <tbody>
-      <tr><td>Username:</td><td><input type="text" class="text tiny" name="username" value="{$smarty.post.username|escape}" size="15" maxlength="20"></td></tr>
-      <tr><td>Password:</td><td><input type="password" class="text tiny" name="password1" value="" size="15" maxlength="20"></td></tr>
-      <tr><td>Repeat Password:</td><td><input type="password" class="text tiny" name="password2" value="" size="15" maxlength="20"></td></tr>
-      <tr><td>Email:</td><td><input type="text" name="email1" class="text small" value="{$smarty.post.email1|escape}" size="15"></td></tr>
-      <tr><td>Email Repeat:</td><td><input type="text" class="text small" name="email2" value="{$smarty.post.email2|escape}" size="15"></td></tr>
+      <tr><td>Username:</td><td><input type="text" class="text tiny" name="username" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required></td></tr>
+      <tr><td>Password:</td><td><input type="password" class="text tiny" name="password1" value="" size="15" maxlength="20" required></td></tr>
+      <tr><td>Repeat Password:</td><td><input type="password" class="text tiny" name="password2" value="" size="15" maxlength="20" required></td></tr>
+      <tr><td>Email:</td><td><input type="text" name="email1" class="text small" value="{$smarty.post.email1|escape|default:""}" size="15" required></td></tr>
+      <tr><td>Email Repeat:</td><td><input type="text" class="text small" name="email2" value="{$smarty.post.email2|escape|default:""}" size="15" required></td></tr>
       <tr><td>PIN:</td><td><input type="password" class="text pin" name="pin" value="" size="4" maxlength="4"><font size="1"> (4 digit number. <b>Remember this pin!</b>)</font></td></tr>
       <tr><td colspan="2">{nocache}{$RECAPTCHA}{/nocache}</td></tr>
       <tr><td class="center"><input type="submit" class="submit small" value="Register"></td><td></td></tr>