diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Captcha.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Captcha.pm
index f81e87352..15778201e 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Captcha.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Captcha.pm
@@ -35,7 +35,7 @@ has ott => (
     }
 );
 
-# Returns secret + a HTML <img> tag with embedded image
+# Returns secret + a HTML image src content
 sub getCaptcha {
     my ($self) = @_;
     my $image = GD::SecurityImage->new(
@@ -49,8 +49,7 @@ sub getCaptcha {
     $image->random;
     $image->create( 'normal', 'default', $self->fgColor, $self->bgColor );
     my ( $imageData, $mimeType, $rdm ) = $image->out( force => 'png' );
-    my $img = '<img src="data:image/png;base64,'
-      . encode_base64( $imageData, '' ) . '">';
+    my $img = 'data:image/png;base64,' . encode_base64( $imageData, '' );
     my $token = $self->ott->createToken( { captcha => $rdm } );
     return ( $token, $img );
 }
@@ -63,7 +62,8 @@ sub validateCaptcha {
         return 0;
     }
     unless ( $s->{captcha} == $value ) {
-        $self->lmLog( 'Bad captcha response', 'notice' ) return 0;
+        $self->lmLog( 'Bad captcha response', 'notice' );
+        return 0;
     }
     $self->lmLog( 'Good captcha response', 'debug' );
     return 1;
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
index d07f541ed..f3ea4965c 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
@@ -182,12 +182,16 @@ sub display {
         );
 
         # Display captcha if it's enabled
-        if ( $self->{captcha_login_enabled} ) {
+        if ( $req->captcha ) {
             %templateParams = (
                 %templateParams,
-                CAPTCHA_IMG  => $req->{captcha_img},
-                CAPTCHA_CODE => $req->{captcha_code},
-                CAPTCHA_SIZE => $req->{captcha_size}
+                CAPTCHA_SRC  => $req->captcha,
+            );
+        }
+        if ( $req->token ) {
+            %templateParams = (
+                %templateParams,
+                TOKEN  => $req->token,
             );
         }
 
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index 1cc0afbc6..1aecfb6de 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -25,15 +25,17 @@
       <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
     </div>
 
-    <TMPL_IF NAME=CAPTCHA_IMG>
+    <TMPL_IF NAME=CAPTCHA_SRC>
     <div class="form-group">
-      <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" />
+      <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
     </div>
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-      <input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
     </div>
-    <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" />
+    </TMPL_IF>
+    <TMPL_IF NAME="TOKEN">
+      <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
     </TMPL_IF>
 
     <button type="submit" class="btn btn-success" >
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
index 7f9b977f7..555fed6b4 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
@@ -33,15 +33,17 @@
       <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
     </div>
 
-    <TMPL_IF NAME=CAPTCHA_IMG>
+    <TMPL_IF NAME=CAPTCHA_SRC>
     <div class="form-group">
-      <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" />
+      <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
     </div>
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-      <input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
     </div>
-    <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" />
+    </TMPL_IF>
+    <TMPL_IF NAME="TOKEN">
+      <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
     </TMPL_IF>
 
     <button type="submit" class="btn btn-success" >
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
index b287c6c6b..3b2e9f334 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
@@ -9,15 +9,17 @@
     <input name="password" type="password" class="form-control" trplaceholder="password" required />
   </div>
 
-  <TMPL_IF NAME=CAPTCHA_IMG>
+  <TMPL_IF NAME=CAPTCHA_SRC>
   <div class="form-group">
-    <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" />
+    <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
   </div>
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-    <input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+    <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
   </div>
-  <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" />
+  </TMPL_IF>
+  <TMPL_IF NAME="TOKEN">
+    <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
   </TMPL_IF>
 
   <TMPL_INCLUDE NAME="checklogins.tpl">
diff --git a/lemonldap-ng-portal/site/templates/impact/mail.tpl b/lemonldap-ng-portal/site/templates/impact/mail.tpl
index 9169e6223..eb568719d 100644
--- a/lemonldap-ng-portal/site/templates/impact/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/impact/mail.tpl
@@ -23,15 +23,17 @@
             <th><span trspan="mail">Mail</span></th>
             <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td>
           </tr>
-          <TMPL_IF NAME=CAPTCHA_IMG>
+          <TMPL_IF NAME=CAPTCHA_SRC>
           <tr><td></td><td>
-            <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+            <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
           </td></tr>
           <tr><th><span trspan="captcha">Captcha</span></th>
-             <td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" />
-             <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
+             <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
           </tr>
           </TMPL_IF>
+          <TMPL_IF NAME="TOKEN">
+            <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+          </TMPL_IF>
           <tr>
             <td colspan="2">
               <div class="buttons">
diff --git a/lemonldap-ng-portal/site/templates/impact/register.tpl b/lemonldap-ng-portal/site/templates/impact/register.tpl
index 560d9fcd6..c118e9e1a 100644
--- a/lemonldap-ng-portal/site/templates/impact/register.tpl
+++ b/lemonldap-ng-portal/site/templates/impact/register.tpl
@@ -31,15 +31,17 @@
             <th><span trspan="mail">Mail</span></th>
             <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td>
           </tr>
-          <TMPL_IF NAME=CAPTCHA_IMG>
+          <TMPL_IF NAME=CAPTCHA_SRC>
           <tr><td></td><td>
-            <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+            <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
           </td></tr>
           <tr><th><span trspan="captcha">Captcha</span></th>
-             <td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" />
-             <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
+             <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
           </tr>
           </TMPL_IF>
+          <TMPL_IF NAME="TOKEN">
+            <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+          </TMPL_IF>
           <tr>
             <td colspan="2">
               <div class="buttons">
diff --git a/lemonldap-ng-portal/site/templates/impact/standardform.tpl b/lemonldap-ng-portal/site/templates/impact/standardform.tpl
index 66a529361..07e7018f5 100644
--- a/lemonldap-ng-portal/site/templates/impact/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/impact/standardform.tpl
@@ -7,16 +7,18 @@
           <input name="password" type="password" tabindex="2" /><br/>
         </p>
 
-        <TMPL_IF NAME=CAPTCHA_IMG>
+        <TMPL_IF NAME=CAPTCHA_SRC>
 	<p>
-          <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+          <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
         </p>
         <p>
           <span class="text-label"><span trspan="captcha">Captcha</span></span><br />
-          <input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" /><br />
-          <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" />
+          <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" /><br />
         </p>
         </TMPL_IF>
+        <TMPL_IF NAME="TOKEN">
+          <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+        </TMPL_IF>
 
         <TMPL_IF NAME="CHECK_LOGINS">
         <p>
diff --git a/lemonldap-ng-portal/site/templates/pastel/mail.tpl b/lemonldap-ng-portal/site/templates/pastel/mail.tpl
index 00717c814..7eb6d1d8a 100644
--- a/lemonldap-ng-portal/site/templates/pastel/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/pastel/mail.tpl
@@ -25,15 +25,17 @@
           <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td>
         </tr>
 
-        <TMPL_IF NAME=CAPTCHA_IMG>
+        <TMPL_IF NAME=CAPTCHA_SRC>
           <tr><td></td><td>
-            <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+            <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
           </td></tr>
           <tr><th><span trspan="captcha">Captcha</span></th>
-            <td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" />
-            <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
+            <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
           </tr>
         </TMPL_IF>
+        <TMPL_IF NAME="TOKEN">
+          <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+        </TMPL_IF>
 
         <tr><td colspan="2">
           <div class="buttons">
diff --git a/lemonldap-ng-portal/site/templates/pastel/register.tpl b/lemonldap-ng-portal/site/templates/pastel/register.tpl
index 712e16966..194244bbb 100644
--- a/lemonldap-ng-portal/site/templates/pastel/register.tpl
+++ b/lemonldap-ng-portal/site/templates/pastel/register.tpl
@@ -35,15 +35,17 @@
           <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td>
         </tr>
 
-        <TMPL_IF NAME=CAPTCHA_IMG>
+        <TMPL_IF NAME=CAPTCHA_SRC>
           <tr><td></td><td>
-            <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+            <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
           </td></tr>
           <tr><th><span trspan="captcha">Captcha</span></th>
-            <td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" />
-            <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
+            <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
           </tr>
         </TMPL_IF>
+        <TMPL_IF NAME="TOKEN">
+          <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+        </TMPL_IF>
 
         <tr><td colspan="2">
           <div class="buttons">
diff --git a/lemonldap-ng-portal/site/templates/pastel/standardform.tpl b/lemonldap-ng-portal/site/templates/pastel/standardform.tpl
index 009d9d701..0b0c49e59 100644
--- a/lemonldap-ng-portal/site/templates/pastel/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/pastel/standardform.tpl
@@ -8,15 +8,17 @@
     <td><input name="password" type="password" tabindex="2" /></td>
   </tr>
 
-  <TMPL_IF NAME=CAPTCHA_IMG>
+  <TMPL_IF NAME="CAPTCHA_SRC">
     <tr><td></td><td>
-      <img src="<TMPL_VAR NAME=CAPTCHA_IMG>" />
+      <img src="<TMPL_VAR NAME="CAPTCHA_SRC">" />
     </td></tr>
     <tr><th><span trspan="captcha">Captcha</span></th>
-      <td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" />
-      <input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
+      <td><input type="text" name="captcha" size="<TMPL_VAR NAME="CAPTCHA_SIZE">" tabindex="3" /></td>
     </tr>
   </TMPL_IF>
+  <TMPL_IF NAME="TOKEN">
+    <input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
+  </TMPL_IF>
 
   <TMPL_IF NAME="CHECK_LOGINS">
     <tr><td colspan="2"><div class="buttons">