for key in user_keys:
                            list_item = os.path.basename(key)
                            list_item = list_item.replace(".key", "")
                            if list_item == "user": list_item = single_pair
                            all_user.append(list_item)
                        for cert in user_certs:
                            list_item = os.path.basename(cert)
                            list_item = list_item.replace(".crt", "")
                            if list_item == "user": list_item = single_pair
                            if not list_item in all_user:
                                all_user.append(list_item)
                        all_user.sort()

                        # Offer a delete all option if there are multiple keys
                        all_item = "[I]Delete all key and certificate files[/I]"
                        if usesMultipleKeys(provider):
                            all_user.append(all_item)

                        # Add in a finished option
                        finished_item = "[I]Finished[/I]"
                        all_user.append(finished_item)

                        # Get the pair to delete
                        index = xbmcgui.Dialog().select(
                            "Select key and certificate to delete, or [I]Finished[/I]",
                            all_user)
                        if all_user[index] == finished_item:
                            still_deleting = False
                        else:
                            if all_user[index] == single_pair:
                                all_user[index] = "user"
                    single_pair = "user  [I](Same key and certificate used for all connections)[/I]"
                    for key in user_keys:
                        list_item = os.path.basename(key)
                        list_item = list_item.replace(".key", "")
                        if list_item == "user": list_item = single_pair
                        all_user.append(list_item)
                    for cert in user_certs:
                        list_item = os.path.basename(cert)
                        list_item = list_item.replace(".crt", "")
                        if list_item == "user": list_item = single_pair
                        if not list_item in all_user: all_user.append(list_item)
                    all_user.sort()

                    # Offer a delete all option if there are multiple keys                
                    all_item = "[I]Delete all key and certificate files[/I]"
                    if usesMultipleKeys(provider):
                        all_user.append(all_item)
                        
                    # Add in a finished option
                    finished_item = "[I]Finished[/I]"
                    all_user.append(finished_item)
                    
                    # Get the pair to delete
                    index = xbmcgui.Dialog().select("Select key and certificate to delete, or [I]Finished[/I]", all_user)
                    if all_user[index] == finished_item:
                        still_deleting = False
                    else:
                        if all_user[index] == single_pair : all_user[index] = "user"
                        if all_user[index] == all_item:                        
                            if xbmcgui.Dialog().yesno(addon_name, "Are you sure you want to delete all key and certificate files for " + provider_display + "?"):
                                for item in all_user: