diff --git a/src/IDF/Views.php b/src/IDF/Views.php
index 2c846f4..4c0e7b0 100644
--- a/src/IDF/Views.php
+++ b/src/IDF/Views.php
@@ -95,9 +95,13 @@ class IDF_Views
             $init = (isset($request->GET['login'])) ? array('initial' => array('login' => $request->GET['login'])) : array();
             $form = new IDF_Form_Register(null, $init);
         }
+        $context = new Pluf_Template_Context(array());
+        $tmpl = new Pluf_Template('idf/terms.html');
+        $terms = Pluf_Template::markSafe($tmpl->render($context));
         return Pluf_Shortcuts_RenderToResponse('idf/register/index.html', 
                                                array('page_title' => $title,
-                                                     'form' => $form),
+                                                     'form' => $form,
+                                                     'terms' => $terms),
                                                $request);
     }
 
diff --git a/src/IDF/templates/idf/register/index.html b/src/IDF/templates/idf/register/index.html
index 3972bbb..9799cc9 100644
--- a/src/IDF/templates/idf/register/index.html
+++ b/src/IDF/templates/idf/register/index.html
@@ -25,12 +25,16 @@
 <span class="helptext">{$form.f.email.help_text}</span>
 </td>
 </tr>
+<tr id="theterms">
+<td>&nbsp;</td>
+<td><div class="theterms">{$terms}</div></td>
+</tr>
 <tr>
 <td>&nbsp;</td>
 <td>
 {if $form.f.terms.errors}{$form.f.terms.fieldErrors}{/if}
 {$form.f.terms|unsafe} <strong>{$form.f.terms.labelTag}</strong><br />
-<span class="helptext">{blocktrans}Read the <a href="#">terms and conditions</a> &ndash; basically <em>"Please be nice, we respect you"</em>.{/blocktrans}</span>
+<span class="helptext">{blocktrans}Read the <a id="showterms" href="#theterms">terms and conditions</a> &ndash; basically <em>"Please be nice, we respect you"</em>.{/blocktrans}</span>
 </td>
 </tr>
 <tr>
@@ -51,7 +55,15 @@
 </div>
 {/block}
 {block javascript}<script type="text/javascript">
-document.getElementById('id_login').focus()
+document.getElementById('id_login').focus();
+{literal}
+$(document).ready(function() {
+    // Hide the key password by default.
+    $("#theterms").hide();
+    $("#showterms").click(function(){
+        $("#theterms").show();
+    });
+});{/literal}
 </script>
 {/block}
 
diff --git a/src/IDF/templates/idf/terms.html b/src/IDF/templates/idf/terms.html
new file mode 100644
index 0000000..4b25303
--- /dev/null
+++ b/src/IDF/templates/idf/terms.html
@@ -0,0 +1,24 @@
+<h3 class="top">Terms and Conditions</h3>
+
+<p><strong>Legal stuff</strong></p>
+
+<ul>
+<li>Respect the others.</li>
+<li>You are legally responsible of what you write.</li>
+<li>Do not write things you will be ashmed of in 5 years.</li>
+<li>We may send you an email some times to times with respect to the use of this service.</li>
+<li>We are not going to spam you in any ways.</li>
+</ul>
+
+<p><strong>Technical stuff</strong></p>
+
+<ul>
+<li>You will need to enable cookies in your browser.</li>
+<li>The interface will look nicer with Javascript enabled.</li>
+<li>We will send you an email to validate your account.</li>
+</ul>
+
+<p><strong>Very important stuff</strong></p>
+
+<p>You are <strong>welcome!</strong></p>
+
diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css
index 3a8f0ac..99abc93 100644
--- a/www/media/idf/css/style.css
+++ b/www/media/idf/css/style.css
@@ -19,7 +19,7 @@
 #
 # ***** END LICENSE BLOCK ***** */
 
-h2.top { 
+.top { 
   margin-top: 0;
 }
 
@@ -120,6 +120,12 @@ div.user-messages {
   width: 90%;
 }
 
+div.theterms { 
+  border: 1px solid rgb(229, 225, 169);
+  background-color: #fffde3;
+  padding: 1em 1em 0 1em;
+}
+
 
 /**
  * Recent issues