diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index aa9715c..54986a9 100755
--- a/code/ddns-lambda.py
+++ b/code/ddns-lambda.py
@@ -73,7 +73,7 @@
 LOGGER = logging.getLogger()
 account_id = None
 region = None
-VERSION = '1.2.0b81'
+VERSION = '1.2.0b82'
 
 # Read Env variables
 DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO')
@@ -688,19 +688,24 @@ def lambda_handler(
                 f"2.1 instance: {instance_id}, using tag_option.name hostname {tag_data['option_name'].hostname} and and tag_option.name zone {tag_data['option_name'].zonename}")
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['option_name'].zonename
+        elif not tag_data['option_name'].valid and tag_data['option_name'].hostname and tag_data['option_name'].zonename and all(flags['noforward'], flags['forcename']):
+            LOGGER.info(
+                f"2.2 instance: {instance_id}, using tag_option.name hostname {tag_data['option_name'].hostname} and and tag_option.name zone {tag_data['option_name'].zonename} [noforward,forcename]")
+            f_hostname = tag_data['option_name'].hostname
+            f_zonename = tag_data['option_name'].zonename
         elif not tag_data['option_name'].valid and tag_data['option_name'].hostname and tag_data['dhcp_options'].valid:
             LOGGER.info(
-                f"2.2 instance: {instance_id}, using tag_option.name hostname {tag_data['option_name'].hostname} and and tag_option.name zone {tag_data['option_name'].zonename}")
+                f"2.3 instance: {instance_id}, using tag_option.name hostname {tag_data['option_name'].hostname} and and tag_option.name zone {tag_data['dhcp_options'].zonename}")
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['dhcp_options'].zonename
         elif tag_data['name'].valid:
             LOGGER.info(
-                f"2.3 instance: {instance_id}, using tag_key.Name hostname {tag_data['name'].hostname} and tag_key.Name zone {tag_data['name'].zonename}")
+                f"2.4 instance: {instance_id}, using tag_key.Name hostname {tag_data['name'].hostname} and tag_key.Name zone {tag_data['name'].zonename}")
             f_hostname = tag_data['name'].hostname
             f_zonename = tag_data['name'].zonename
         elif not tag_data['name'].valid and tag_data['dhcp_options'].valid:
             LOGGER.info(
-                f"2.4 instance: {instance_id}, using default ip-addresss hostname {default_hostname} and dhcp_options zone {tag_data['dhcp_options'].zonename}")
+                f"2.5 instance: {instance_id}, using default ip-addresss hostname {default_hostname} and dhcp_options zone {tag_data['dhcp_options'].zonename}")
             f_hostname = default_hostname
             f_zonename = tag_data['dhcp_options'].zonename
         else:
diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip
index d362c27..19a5fe0 100644
Binary files a/code/ddns-lambda.zip and b/code/ddns-lambda.zip differ