Clean up

app/methods/user_methods.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import datetime, random, secrets
+import urllib.parse
 
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
@@ -575,8 +576,8 @@ def email_user_auth_key_url(
     else: enable_to_str = '-- Not Set --'
     auth_key = user_obj.auth_key
 
-    user_login_url = f'{root_url}user/login?username={username}'
-    user_login_auth_key_url = f'{root_url}?user_id={user_id_random}&auth_key={new_auth_key}'
+    user_login_url = f'{root_url}user/login?username={urllib.parse.quote(username)}&email={urllib.parse.quote(to_email)}'
+    user_login_auth_key_url = f'{root_url}?user_id={urllib.parse.quote(user_id_random)}&auth_key={urllib.parse.quote(new_auth_key)}&valid_email={True}'
 
     subject = f'{account_short_name}: One Time Use Sign In Link ({new_auth_key})'