diff --git a/frontend/_includes/footer.html b/frontend/_includes/footer.html
index 6b816e7483d005f8378485398b14c0b6904dc57a..a2db5a47d643376f3136a159b0a5325eb68479f2 100644
--- a/frontend/_includes/footer.html
+++ b/frontend/_includes/footer.html
@@ -1,8 +1,9 @@
 <footer id="footer" class="footer has-text-centered">
 	<div class="content has-text-centered"></div>
 	<p class="info">
-		</p><p>{% t copyright_text %}  </p><p> 
-			<a href="https://murena.com/terms-conditions/" target="_blank"> {% t terms_conditions %} </a> -  
+		</p><p>{% t copyright_text %}  </p><p>
+			<a href="https://murena.com/terms-conditions/" target="_blank"> {% t terms_conditions %} </a> -
 			<a href="https://murena.com/privacy-policy/" target="_blank"> {% t privacy_policy %} </a> </p>					<p></p>
 	</div>
-</footer>
\ No newline at end of file
+</footer>
+{% include friendly_captcha_deps.html %}
diff --git a/frontend/_includes/friendly_captcha_deps.html b/frontend/_includes/friendly_captcha_deps.html
new file mode 100644
index 0000000000000000000000000000000000000000..8edf7067eda6077835ceb37882d92635caed28d1
--- /dev/null
+++ b/frontend/_includes/friendly_captcha_deps.html
@@ -0,0 +1,2 @@
+<script type="module" src="https://unpkg.com/friendly-challenge@0.9.7/widget.module.min.js" async defer></script>
+<script nomodule src="https://unpkg.com/friendly-challenge@0.9.7/widget.min.js" async defer></script>
diff --git a/frontend/_includes/friendly_captcha_input.html b/frontend/_includes/friendly_captcha_input.html
new file mode 100644
index 0000000000000000000000000000000000000000..e2ffa63b811197fa3a5ea1a8c995d951156bd568
--- /dev/null
+++ b/frontend/_includes/friendly_captcha_input.html
@@ -0,0 +1,4 @@
+<div class="frc-captcha" data-sitekey="FCMIQ67VSDIAPCJD"
+    data-puzzle-endpoint="https://eu-api.friendlycaptcha.eu/api/v1/puzzle"
+    data-lang="{{site.lang}}">
+</div>
diff --git a/frontend/email_invite.html b/frontend/email_invite.html
index 88d75254b6157e595a814d1d7a9586e8085e2b95..53be0b4dd14ac91ab9e0989ca0a7b296d9a84d9a 100644
--- a/frontend/email_invite.html
+++ b/frontend/email_invite.html
@@ -55,6 +55,8 @@ flags:
         <div class="field">
           <div class="control">
 			  <label>{% t human_verification %}</label>
+            {% include friendly_captcha_input.html %}
+            {% comment%}
             <input
               class="requestInput"
               autocomplete="off"
@@ -64,13 +66,16 @@ flags:
               onfocus="this.value=''"
               placeholder="{% t captcha_label_math %}"
             />
+            {% endcomment%}
           </div>
         </div>
+        {% comment%}
 		<div class="field captcha_img_div">
-			<figure class="image">
+          <figure class="image">
 			<img id="captcha_img" src="/signup/captcha_img.php" alt="Code" />
-			</figure>
+          </figure>
 		</div>
+        {% endcomment%}
       </div>
 
       <input
diff --git a/htdocs/process_email_invite.php b/htdocs/process_email_invite.php
index b75323337052ecf029ec1fba4a8cc761b4a3dda1..07c5197adb9367cfbed18b85b735165bd980d73b 100644
--- a/htdocs/process_email_invite.php
+++ b/htdocs/process_email_invite.php
@@ -192,18 +192,52 @@ function captcha_check($email, $from_easy_installer)
             respond_with_json($ret);
         }
     } else {
-        $result = new \stdClass();
-        $secure = isset($_POST['secure']) ? $_POST['secure'] : '';
-        $secure = is_string($secure) ? strtolower($secure) : '';
 
-        $isSessionCodeSet = isset($_SESSION['securecode']);
-        $isSecureCodeRight = $secure == $_SESSION['securecode'];
+        $friendlyCaptchaSiteKey = getenv("FRIENDLY_CAPTCHA_SITE_KEY");
+        $friendlyCaptchaAPIKey = getenv("FRIENDLY_CAPTCHA_API_KEY");
+        $result = new \stdClass();
 
-        if (!($isSessionCodeSet && $isSecureCodeRight)) {
-            unset($_SESSION['securecode']);
-            $result->type = "secure_code";
-            $result->key = "error_secure_code";
-            respond_with_message(400, $result, false, $email);
+        if (isset($friendlyCaptchaAPIKey) && isset($friendlyCaptchaSiteKey)) {
+            // FriendlyCaptcha enabled
+            $solution = $_POST['frc-captcha-solution'] ?? '';
+            $friendlyCaptchaResponse = curlPostJSON(
+                'https://eu-api.friendlycaptcha.eu/api/v1/siteverify',
+                array(
+                    'solution' => $solution,
+                    'secret' => $friendlyCaptchaAPIKey,
+                    'sitekey' => $friendlyCaptchaSiteKey
+                )
+            );
+            if ($friendlyCaptchaResponse->statusCode === 200) {
+                if ($friendlyCaptchaResponse->output->success) {
+                    error_log('Friendly Captcha PASSED!');
+                } else {
+                    // captcha puzzle was not solved, reason will be
+                    // invalid or timeout/duplicate
+                    error_log('Friendly Captcha check failed ' . print_r($friendlyCaptchaResponse->output));
+                    $result->type = "secure_code";
+                    $result->key = "error_secure_code";
+                    respond_with_message(400, $result, false, $email);
+                }
+            } else{
+                error_log('WARNING, non-200 response from Friendly Captcha ' . $friendlyCaptchaResponse->statusCode);
+                // They recommend proceeding but for now we validate the implementation is good
+                $result->type = "secure_code";
+                $result->key = "error_secure_code";
+                respond_with_message(400, $result, false, $email);
+            }
+        } else {
+            // Use local captcha solution - selfhost?
+            $solution = isset($_POST['secure']) ? $_POST['secure'] : '';
+            $solution = is_string($solution) ? strtolower($solution) : '';
+            $isSessionCodeSet = isset($_SESSION['securecode']);
+            $isSecureCodeRight = ($solution == $_SESSION['securecode']);
+            if (!($isSessionCodeSet && $isSecureCodeRight)) {
+                unset($_SESSION['securecode']);
+                $result->type = "secure_code";
+                $result->key = "error_secure_code";
+                respond_with_message(400, $result, false, $email);
+            }
         }
     }
 }