diff --git a/mobsf/MobSF/views/admin.py b/mobsf/MobSF/views/admin.py
index 218614abeb..e26125f4fe 100644
--- a/mobsf/MobSF/views/admin.py
+++ b/mobsf/MobSF/views/admin.py
@@ -78,6 +78,9 @@ def admin_view(request):
     min_exp_date = utcnow() + datetime.timedelta(days=1)
     max_exp_date = utcnow() + datetime.timedelta(days=365)
     default_exp_date = utcnow() + datetime.timedelta(days=90)
+    print(min_exp_date)
+    print(max_exp_date)
+    print(default_exp_date)
     entries = []
     api_keys = get_api_keys()
     for entry in api_keys:
@@ -106,8 +109,7 @@ def create_api_key_post(request):
         if (not is_admin(request)):
             return error_response(request, 'Unauthorized')
 
-        max_date = utcnow()
-        max_date = max_date.replace(year=max_date.year + 1)
+        max_date = utcnow() + datetime.timedelta(days=365)
         # Validate input parameters
         description = request.POST['description']
         email = request.POST['email']
@@ -186,8 +188,7 @@ def edit_api_key_post(request):
         if (not is_admin(request)):
             return error_response(request, 'Unauthorized')
 
-        max_date = utcnow()
-        max_date = max_date.replace(year=max_date.year + 1)
+        max_date = utcnow() + datetime.timedelta(days=365)
         # Validate input parameters
         key_id = request.POST['id']
         description = request.POST['description']
diff --git a/mobsf/templates/general/admin.html b/mobsf/templates/general/admin.html
index 70bee6697a..65c1adbc01 100644
--- a/mobsf/templates/general/admin.html
+++ b/mobsf/templates/general/admin.html
@@ -298,15 +298,12 @@ <h4 class="modal-title">Edit API Key</h4>
     var description = '';
     var email = '';
     var expiredate = '';
-    var maxdate = '';
     for (var i = 0; i < api_keys.length; i++) {
       if (api_keys[i]['ID'] == id) {
         description = api_keys[i]['DESCRIPTION'];
         role = api_keys[i]['ROLE'];
         email = api_keys[i]['EMAIL'];
         expiredate = api_keys[i]['EXPIRE_DATE'];
-        maxdate = new Date(api_keys[i]['CREATE_DATE']);
-        maxdate.setFullYear(maxdate.getFullYear() + 1);
       }
     }
     $('#edit_apikey_id').val(id);
@@ -322,7 +319,6 @@ <h4 class="modal-title">Edit API Key</h4>
     $('#edit_email').val(email);
     var expire_date_input = $('#edit_expire_date');
     expire_date_input.val(expiredate.split('T')[0]);
-    expire_date_input.attr('max', maxdate.toISOString().split('T')[0]);
     $('#edit_api_key_form').removeClass('was-validated');
     $('#edit_api_key').modal('show');
   }