diff --git a/pages/account/3.php b/pages/account/3.php
index e6b266a..99238d0 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -78,7 +78,22 @@ if($_SESSION['profile']['points'] >= 50)
     </td>
   </tr>
 <? } ?>
+
   <tr>
+    <td class="DataTD" colspan="2" align="left">
+      <input type="checkbox" name="login" value="1" checked="checked"> <?=_("Enable certificate login with this certificate")?><br>
+      <?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?><br/>
+    </td>
+  </tr>
+
+
+  <tr name="expertoff" style="display:none">
+    <td class="DataTD" colspan="2" align="left">
+      <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)"/><?=_("Show advanced options")?>
+    </td>
+  </tr>
+
+  <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
 	<input type="radio" name="SSO" value="0" checked> <?=_("No Single Sign On ID")?><br>
 	<input type="radio" name="SSO" value="1"> <?=_("Add Single Sign On ID Information")?><br>
@@ -86,10 +101,10 @@ if($_SESSION['profile']['points'] >= 50)
 	<a href="http://wiki.cacert.org/wiki/SSO">SSO WIKI Entry</a>
     </td>
   </tr>
- <tr>
+ <tr name="expert">
     <td class="DataTD" colspan="2"><?=_("Optional Client CSR, no information on the certificate will be used")?></td>
  </tr>
- <tr>
+ <tr name="expert">
     <td class="DataTD" colspan="2"><textarea name="optionalCSR" cols="80" rows="5"></textarea></td>
  </tr>
  <tr>
@@ -98,3 +113,23 @@ if($_SESSION['profile']['points'] >= 50)
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form>
+
+<script language="javascript">
+function showExpert(a)
+{
+  b=document.getElementsByName("expert");
+  for(i=0;b.length>i;i++)
+  {
+    if(!a) {b[i].setAttribute("style","display:none"); }
+    else {b[i].removeAttribute("style");}
+  }
+  b=document.getElementsByName("expertoff");
+  for(i=0;b.length>i;i++)
+  {
+    b[i].removeAttribute("style");
+  }
+
+}
+showExpert(false);
+</script>
+