diff --git a/e911_helper.py b/e911_helper.py
index febbb69..6c4c77b 100644
--- a/e911_helper.py
+++ b/e911_helper.py
@@ -82,7 +82,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL VOICE1 OR I
     """
     )
 
-add_type_list = [
+address_type_list = [
     "",
     "Apartment",
     "Basement",
@@ -127,17 +127,17 @@ def prompt_credentials(config):
         config["tenant"] = {tenant: {}}
         config["tenant"][tenant]["username"] = input(
             f"Enter your {Colors.LIGHT_CYAN}{tenant}{Colors.END} api.switchvoxuc.com username: "
-        )
+        ) or config["username"]
         config["tenant"][tenant]["password"] = getpass(
             f"Enter your {Colors.LIGHT_CYAN}{tenant}{Colors.END} api.switchvoxuc.com password: "
-        )
+        ) or config["password"]
         config["tenant"][tenant]["provider_username"] = input(
             f"Enter your {Colors.LIGHT_CYAN}{tenant}{Colors.END} api.nwsip.com username: "
         )
         config["tenant"][tenant]["provider_password"] = getpass(
             f"Enter your {Colors.LIGHT_CYAN}{tenant}{Colors.END} api.nwsip.com password: "
         )
-
+    logger.debug(config)
     return config
 
 
@@ -663,7 +663,7 @@ def prompt_address_type(default_type=15, **kwargs):
     Generates numeric list to select from.
     returns tuple 'address_type', 'address_type_number'
     """
-    for i, addy_type in enumerate(add_type_list):
+    for i, addy_type in enumerate(address_type_list):
         print(f"{i:2}) {addy_type}")
     address_type = (
         input(
@@ -679,7 +679,7 @@ def prompt_address_type(default_type=15, **kwargs):
                 address_type_number = address_type_number.replace(" ", "_")
                 break
     # Return values to textual response as expected by API.
-    return add_type_list[int(address_type)], address_type_number
+    return address_type_list[int(address_type)], address_type_number
 
 
 def prompt_address(old_address=None, **kwargs):
@@ -707,16 +707,6 @@ def prompt_address(old_address=None, **kwargs):
         country=input(f"Enter country: [US] ") or "US",
     )
 
-    # Print list of address types:
-    # print(json.dumps(add_type_list, indent=4))
-
-    # address_type = input(f"Address Type (pick from above list) [Residential]: ") or 'Residential'
-    # if address_type == 'Residential':
-    #     address_type_number = ""
-    #     logger.warning(f"Address Type set to {address_type} no address_type_number can be added. Please verify your entry.")
-    # else:
-    #     address_type_number = input(f"Enter address type number: ") or ''
-
     address_type, address_type_number = prompt_address_type()
     address["address_type"] = address_type
     address["address_type_number"] = address_type_number