diff --git a/index.php b/index.php
index bee7076..9ba8c6b 100644
--- a/index.php
+++ b/index.php
@@ -32,21 +32,28 @@ $title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title
 		</div>
 
 		<?php
-			if ( !empty(ISQ::$recaptcha['sitekey']) && !empty(ISQ::$recaptcha['secret']) ) {
+			if ( yourls_is_valid_user() == 1 ) {
+
+				echo '<input type="hidden" name="antispam_method" value="user_login" class="hidden">';
+
+			} else if ( !empty(ISQ::$recaptcha['sitekey']) && !empty(ISQ::$recaptcha['secret']) ) {
+
 				$dependencies[] = 'reCAPTCHA';
-		?>
-			<div class="form-item recaptcha-container">
-				<p><label class="primary" title=""><?php yourls_e( 'Verification', 'isq_translation'); ?></label></p>
-				<p><label class="secondary"><?php yourls_e( 'reCAPTCHA verification used to ensure you are not a bot.', 'isq_translation'); ?></label></p>
-				<div class="g-recaptcha" data-sitekey="<?php echo ISQ::$recaptcha['sitekey']; ?>"></div>
-			</div>
-		<?php
+
+				echo '<input type="hidden" name="antispam_method" value="recaptcha" class="hidden">';
+			?>
+				<div class="form-item recaptcha-container">
+					<p><label class="primary" title=""><?php yourls_e( 'Verification', 'isq_translation'); ?></label></p>
+					<p><label class="secondary"><?php yourls_e( 'reCAPTCHA verification used to ensure you are not a bot.', 'isq_translation'); ?></label></p>
+					<div class="g-recaptcha" data-sitekey="<?php echo ISQ::$recaptcha['sitekey']; ?>"></div>
+				</div>
+			<?php
+
 			} else {
-		?>
-			<div class="hidden">
-				<input type="hidden" name="basic_antispam">
-			</div>
-		<?php
+
+				echo '<input type="hidden" name="antispam_method" value="basic" class="hidden">';
+				echo '<input type="hidden" name="basic_antispam" class="hidden">';
+
 			}
 		?>
 
diff --git a/result.php b/result.php
index 068e639..8c4d366 100644
--- a/result.php
+++ b/result.php
@@ -17,19 +17,38 @@ if ( empty( $_REQUEST['url'] ) ) {
 	display_error( yourls__( 'You haven\'t entered a URL to shorten. Please go back and try again.', 'isq_translation' ) );
 };
 
-if ( !empty(ISQ::$recaptcha['sitekey']) && !empty(ISQ::$recaptcha['secret']) ) {
+// Check what CAPTCHA method was used
+$antispam_method = $_REQUEST['antispam_method'];
+
+if ( $antispam_method == 'user_login' ) {
+
+	// User is logged into YOURLS
+
+} else if ( $antispam_method == 'recaptcha' ) {
+
+	// Google reCAPTCHA is enabled
 	$recaptcha_data = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . ISQ::$recaptcha['secret'] . '&response=' . $_REQUEST['g-recaptcha-response']);
 	$recaptcha_json = json_decode($recaptcha_data, TRUE);
 
-	// What happens when the CAPTCHA was completed incorrectly
+	// What happens when the reCAPTCHA was completed incorrectly
 	if ( $recaptcha_json['success'] != 'true' ) {
 		display_error( yourls__( 'Are you a bot? Google certainly thinks you are. Please go back and try again.', 'isq_translation' ) );
 	}
-} else {
+
+} else if ( $antispam_method == 'basic' ) {
+
+	// Basic antispam protection fallback
+	// What happens when it was not completed correctly
 	if ( $_REQUEST['basic_antispam'] != "" ) {
 		display_error( yourls__( 'Are you a bot? The verification was not completed successfully. Please go back and try again.', 'isq_translation' ) );
 	}
-};
+
+} else {
+
+	// No antispam protection was detected
+	display_error( yourls__( 'Are you a bot? No antispam protection was completed successfully. Please go back and try again.', 'isq_translation' ) );
+
+}
 
 // Get parameters -- they will all be sanitized in yourls_add_new_link()
 $url     = $_REQUEST['url'];