diff --git a/config.php b/config.php
index 4f4d4c5a..50f42d66 100644
--- a/config.php
+++ b/config.php
@@ -135,13 +135,17 @@ $config = array(
 	'smtp_secure' => '', // What kind of encryption to use on the SMTP connection. Options: '', 'ssl' (GMail) or 'tls' (Microsoft Outlook)
 	'smtp_debug' => false, // set true to debug (you will see more info in error.log)
 
-	// Google reCAPTCHA v3 (prevent spam bots)
+	// Google reCAPTCHA (prevent spam bots)
 	'recaptcha_enabled' => false, // enable recaptcha verification code
+	'recaptcha_type' => 'v3', // 'v2-checkbox', 'v2-invisible', 'v3'
 	'recaptcha_site_key' => '', // get your own site and secret keys at https://www.google.com/recaptcha
 	'recaptcha_secret_key' => '',
+	// following option apply only for ReCaptcha v2-checkbox
+	'recaptcha_v2_theme' => 'light', // light, dark
+	// following option apply only for ReCaptcha v3
 	// min score for validation, between 0 - 1.0
 	// https://developers.google.com/recaptcha/docs/v3#interpreting_the_score
-	'recaptcha_min_score' => 0.5,
+	'recaptcha_v3_min_score' => 0.5,
 
 	//
 	'generate_new_reckey' => true,				// let player generate new recovery key, he will receive e-mail with new rec key (not display on page, hacker can't generate rec key)
diff --git a/system/get_version_for_release.php b/system/get_version_for_release.php
index fa378dbb..c4070d4d 100644
--- a/system/get_version_for_release.php
+++ b/system/get_version_for_release.php
@@ -1,4 +1,6 @@
 <?php
 
 require __DIR__ . '/../common.php';
-echo MYAAC_VERSION;
+if(IS_CLI) {
+	echo MYAAC_VERSION;
+}
diff --git a/system/libs/GoogleReCAPTCHA.php b/system/libs/GoogleReCAPTCHA.php
index fe4bda0a..3dd18b28 100644
--- a/system/libs/GoogleReCAPTCHA.php
+++ b/system/libs/GoogleReCAPTCHA.php
@@ -41,17 +41,22 @@ class GoogleReCAPTCHA
 		}
 
 		$json = json_decode($response);
-		//log_append('recaptcha.log', 'recaptcha_score: ' . $json->score . ', action:' . $json->action);
-		if (!isset($json->action) || $json->action !== $action) {
-			self::$errorType = self::ERROR_INVALID_ACTION;
-			self::$errorMessage = 'Google ReCaptcha returned invalid action.';
-			return false;
-		}
 
-		if (!isset($json->score) || $json->score < config('recaptcha_min_score')) {
-			self::$errorType = self::ERROR_LOW_SCORE;
-			self::$errorMessage = 'Your Google ReCaptcha score was too low.';
-			return false;
+		$recaptchaType = config('recaptcha_type');
+		if ($recaptchaType === 'v3') { // score based
+			//log_append('recaptcha.log', 'recaptcha_score: ' . $json->score . ', action:' . $json->action);
+
+			if (!isset($json->action) || $json->action !== $action) {
+				self::$errorType = self::ERROR_INVALID_ACTION;
+				self::$errorMessage = 'Google ReCaptcha returned invalid action.';
+				return false;
+			}
+
+			if (!isset($json->score) || $json->score < config('recaptcha_v3_min_score')) {
+				self::$errorType = self::ERROR_LOW_SCORE;
+				self::$errorMessage = 'Your Google ReCaptcha score was too low.';
+				return false;
+			}
 		}
 
 		if (!isset($json->success) || !$json->success) {
diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig
index 6b60207f..b5dfc2e2 100644
--- a/system/templates/account.create.html.twig
+++ b/system/templates/account.create.html.twig
@@ -109,8 +109,24 @@
 
 												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORDS') }}
 
-												{% if config.recaptcha_enabled %}
-													<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
+                                                {% if config.recaptcha_enabled %}
+													{% if config.recaptcha_type == 'v3' %}
+														<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
+													{% elseif config.recaptcha_type == 'v2-invisible' %}
+														<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-bind="login-submit"></div>
+													{% elseif config.recaptcha_type == 'v2-checkbox' %}
+														<tr>
+															<td class="LabelV" style="width: 150px">
+																<span{% if errors.verification[0] is not null %} class="red"{% endif %}>Verification:</span>
+															</td>
+															<td>
+																<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_v2_theme }}"></div>
+															</td>
+														</tr>
+														{% if errors.verification is defined %}
+															<tr><td></td><td><span class="FormFieldError">{{ errors.verification }}</span></td></tr>
+														{% endif %}
+                                                	{% endif %}
 												{% endif %}
 
 												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_RECAPTCHA') }}
@@ -329,9 +345,9 @@
 </form>
 {{ hook('HOOK_ACCOUNT_CREATE_AFTER_FORM') }}
 <script type="text/javascript" src="tools/check_name.js"></script>
-{% if config.recaptcha_enabled %}
+{% if config.recaptcha_enabled and config.recaptcha_type == 'v3' %}
 	{% set action = 'register' %}
-	{{ include('google_recaptcha.html.twig') }}
+	{{ include('google_recaptcha_v3.html.twig') }}
 {% endif %}
 <style>
 	#SuggestAccountNumber {
diff --git a/system/templates/account.login.html.twig b/system/templates/account.login.html.twig
index 2277ef16..5edaec75 100644
--- a/system/templates/account.login.html.twig
+++ b/system/templates/account.login.html.twig
@@ -40,7 +40,20 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="?s
 									<label for="remember_me"> Remember me</label></td>
 							</tr>
 							{% if config.recaptcha_enabled %}
+								{% if config.recaptcha_type == 'v3' %}
 								<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
+								{% elseif config.recaptcha_type == 'v2-invisible' %}
+									<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-bind="login-submit"></div>
+								{% elseif config.recaptcha_type == 'v2-checkbox' %}
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if error is not null %} class="red"{% endif %}>Verification:</span>
+									</td>
+									<td>
+										<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_v2_theme }}"></div>
+									</td>
+								</tr>
+								{% endif %}
 							{% endif %}
 							{% if error is not null %}
 								<tr><td></td><td><span class="FormFieldError">{{ error }}</span></td></tr>
@@ -77,7 +90,7 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="?s
 			</td>
 		</tr>
 	</table>
-{% if config.recaptcha_enabled %}
+{% if config.recaptcha_enabled and config.recaptcha_type == 'v3' %}
 	{% set action = 'login' %}
-	{{ include('google_recaptcha.html.twig') }}
+	{{ include('google_recaptcha_v3.html.twig') }}
 {% endif %}
diff --git a/system/templates/google_recaptcha_v3.html.twig b/system/templates/google_recaptcha_v3.html.twig
new file mode 100644
index 00000000..a090aec5
--- /dev/null
+++ b/system/templates/google_recaptcha_v3.html.twig
@@ -0,0 +1,11 @@
+<script>
+	$(document).ready(function() {
+		grecaptcha.ready(function() {
+			grecaptcha.execute('{{ config.recaptcha_site_key }}', {action: '{{ action }}'}).then(function(token) {
+				if (token) {
+					document.getElementById('g-recaptcha-response').value = token;
+				}
+			});
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/system/templates/templates.header.html.twig b/system/templates/templates.header.html.twig
index d6ae1fbb..00015677 100644
--- a/system/templates/templates.header.html.twig
+++ b/system/templates/templates.header.html.twig
@@ -17,5 +17,5 @@
 	</div>
 </noscript>
 {% if config.recaptcha_enabled %}
-<script src="https://www.google.com/recaptcha/api.js?render={{ config.recaptcha_site_key }}"></script>
+<script src="https://www.google.com/recaptcha/api.js{% if config('recaptcha_type') == 'v2-checkbox' %}?render={{ config.recaptcha_site_key }}{% endif %}"></script>
 {% endif %}
diff --git a/templates/tibiacom/account.login.html.twig b/templates/tibiacom/account.login.html.twig
index b834df9c..3ff09a11 100644
--- a/templates/tibiacom/account.login.html.twig
+++ b/templates/tibiacom/account.login.html.twig
@@ -48,7 +48,20 @@
 																	<label for="remember_me"> Remember me</label></td>
 															</tr>
 															{% if config.recaptcha_enabled %}
-																<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
+																{% if config.recaptcha_type == 'v3' %}
+																	<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
+																{% elseif config.recaptcha_type == 'v2-invisible' %}
+																	<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-bind="login-submit"></div>
+																{% elseif config.recaptcha_type == 'v2-checkbox' %}
+																	<tr>
+																		<td class="LabelV" style="width: 150px">
+																			<span{% if error is not null %} class="red"{% endif %}>Verification:</span>
+																		</td>
+																		<td>
+																			<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_v2_theme }}"></div>
+																		</td>
+																	</tr>
+																{% endif %}
 															{% endif %}
 														</table>
 														<div style="float: right; font-size: 1px;" >
@@ -147,7 +160,7 @@
 		</tr>
 	</table>
 </div>
-{% if config.recaptcha_enabled %}
+{% if config.recaptcha_enabled and config.recaptcha_type == 'v3' %}
 	{% set action = 'login' %}
-	{{ include('google_recaptcha.html.twig') }}
+	{{ include('google_recaptcha_v3.html.twig') }}
 {% endif %}