Account backup fix to allow backup by username only