diff --git a/docker_container_version/main.py b/docker_container_version/main.py
index d8f189f..81476ec 100644
--- a/docker_container_version/main.py
+++ b/docker_container_version/main.py
@@ -128,7 +128,6 @@ def check_list_of_prefixes_against_ROA(origin, prefixes, origins, roa_prefix, ro
     :param roa_asn: ASN from the ROA
     :return: list output lines to be displayed on the web page
     """
-
     messages = []
     existing_roa_status = get_prefix_roa_status(roa_prefix, origin)
     messages.append([roa_prefix, return_rov_status(roa_prefix, roa_maxlen, roa_asn, roa_prefix, origin), origin,
@@ -156,6 +155,10 @@ def index():
 
         origin_asn = request.form['origin_asn']
         origin_asn = origin_asn.strip()
+
+        origin_asn = get_asn_from_as(origin_asn)
+
+
         # Validate the origin ASN
         if not is_valid_asn(origin_asn):
             return f"\"{origin_asn}\" is an Invalid origin ASN"
@@ -168,6 +171,7 @@ def index():
         roa_ip_prefix = request.form['ip_prefix']
         roa_prefix_maxlength = int(request.form['prefix_maxlength'])
         roa_origin_asn = request.form['origin_asn']
+        roa_origin_asn = get_asn_from_as(roa_origin_asn)
         prefix_info = get_prefix_info(roa_ip_prefix)
         if prefix_info is None:
             return "Prefix not found or problems with RIPEstat API"