diff --git a/src/endpoints/accounts.py b/src/endpoints/accounts.py
index a5340ef..41e5f6c 100644
--- a/src/endpoints/accounts.py
+++ b/src/endpoints/accounts.py
@@ -19,6 +19,8 @@
 async def login(response: Response, username: str = Form(), password: str = Form(), force_lopolis: str = Form("false")):
     username = username.replace("@gimb.org", "")
     username = username.replace("@dijaki.gimb.org", "")
+    username = username.replace("@gimb.si", "")
+    username = username.replace("@dijaki.gimb.si", "")
     username = username.replace(" ", "")
 
     print(f"[LOGIN] Prijavljam uporabnika {username} v BežiApp.")
diff --git a/src/endpoints/consts.py b/src/endpoints/consts.py
index 1241fe3..f932a01 100644
--- a/src/endpoints/consts.py
+++ b/src/endpoints/consts.py
@@ -102,17 +102,17 @@ async def login(self):
 def encrypt_key(password: str) -> bytes:
     return hashlib.sha256(password.encode()).digest()
 
-def encrypt(raw, password):
-    raw = pad(raw, AES.block_size)
-    iv = Random.new().read(AES.block_size)
+def encrypt(raw: str, password: str):
+    raw = pad(raw.encode(), BLOCK_SIZE)
+    iv = Random.new().read(BLOCK_SIZE)
     cipher = AES.new(encrypt_key(password), AES.MODE_CBC, iv)
     return base64.b64encode(iv + cipher.encrypt(raw))
 
-def decrypt(enc, password):
+def decrypt(enc: str, password: str):
     enc = base64.b64decode(enc)
-    iv = enc[:AES.block_size]
+    iv = enc[:BLOCK_SIZE]
     cipher = AES.new(encrypt_key(password), AES.MODE_CBC, iv)
-    return unpad(cipher.decrypt(enc[AES.block_size:]), AES.block_size).decode('utf-8')
+    return unpad(cipher.decrypt(enc[BLOCK_SIZE:]), BLOCK_SIZE).decode('utf-8')
 
 """
 Legacy code. Not working due to