diff --git a/game/src/gui.ts b/game/src/gui.ts
index 16a79b6..d2fcd93 100644
--- a/game/src/gui.ts
+++ b/game/src/gui.ts
@@ -73,20 +73,21 @@ declare global {
       elements.name!.innerText = data.name!;
       elements.key!.innerText = key!;
     } else {
-      console.log("not logged in")
       elements.bar.logged!.style.display = "none"
       elements.bar.loggedout!.style.display = ""
     }
   }
 
   async function login() {
-    const key = prompt("Type in the #key")
+    let key = prompt("Type in the #key")
 
     if (!key) {
       alert("Login cancelled")
       return
     }
 
+    key = key.replace(/\#/g, '')
+
     const response = await API.login(key)
 
     if (response.error) {
diff --git a/server/Auth.js b/server/Auth.js
index dd5d542..621c128 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -1,10 +1,20 @@
-import { SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION } from 'constants';
 import { randomBytes } from 'crypto'
 import jwt from 'jsonwebtoken'
 import db from './Database.js'
 
 export default {
   async createAccount(name) {
+    if (typeof name !== "string")
+      return {
+        error: "Incorrect name"
+      }
+
+    const re = /^[a-zA-z0-9_$][a-zA-z0-9 _$]{,15}$/
+    if (!re.test(name))
+      return {
+        error: "Incorrect name"
+      }
+
     console.log("Creating user");
     if (db.userExists(name)) {
       console.log("User exists");
@@ -36,6 +46,11 @@ export default {
 
   login(password) {
     console.log("Logging user");
+    if (typeof password !== "string")
+      return {
+        error: "User does not exists"
+      }
+
     const user = db.getUserByPassword(password)
 
     if (!user) {