diff --git a/csgo-hub-backend b/csgo-hub-backend
new file mode 100755
index 0000000..ce803fe
Binary files /dev/null and b/csgo-hub-backend differ
diff --git a/index.html b/index.html
index 8e975c3..4e7f04c 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
   {{if .DiscordName}}
   <div class="navbar">
     <ul>
-      <li style="float:right"><img alt="avatar" src="https://cdn.discordapp.com/avatars/{{.DiscordAvatar}}.png?size=100" width="50" height="50px"></li>
+      <li style="float:right"><img alt="avatar" src="{{.DiscordAvatar}}" width="50" height="50px"></li>
       <li style="float:right"><a class="active" href="#">{{.DiscordName}}</a></li>
     </ul> 
   </div>
diff --git a/main.go b/main.go
index b61bfef..2517df1 100644
--- a/main.go
+++ b/main.go
@@ -151,13 +151,22 @@ func CreateToken(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "Bad request")
 		return
 	}
+	var dbToken string
+	query := `SELECT token FROM tokens where discord_id = ?`
+	_ = db.QueryRow(query, discord).Scan(&dbToken)
 
-	_, err = db.Exec(`INSERT INTO tokens(discord_id, token) VALUES (?, ?)`, discord, token)
-	if err != nil {
-		log.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprintf(w, "Bad request")
-		return
+	if dbToken != "" {
+		token = dbToken
+	}
+
+	if token != dbToken {
+		_, err = db.Exec(`INSERT INTO tokens(discord_id, token) VALUES (?, ?)`, discord, token)
+		if err != nil {
+			log.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprintf(w, "Bad request")
+			return
+		}
 	}
 
 	json.NewEncoder(w).Encode(token)
diff --git a/steam.go b/steam.go
index d449844..83fb559 100644
--- a/steam.go
+++ b/steam.go
@@ -66,7 +66,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// 959336363172442152/1ce1214a9540ff02cedc0acd0ad37d1f.png
-	req, err := http.NewRequest("GET", "https://discord.com/api/v9/users/"+discordId, nil)
+	req, _ := http.NewRequest("GET", "https://discord.com/api/v9/users/"+discordId, nil)
 	req.Header.Add("Authorization", bearer)
 
 	client := &http.Client{}
@@ -82,7 +82,13 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	var discord DiscordUser
 	json.Unmarshal(body, &discord)
-	tmpl := IndexStruct{DiscordName: discord.Username, DiscordAvatar: discord.Id + "/" + discord.Avatar}
+	var discordAvatarURL string
+	if discord.Avatar == "" {
+		discordAvatarURL = "https://csgohub.xyz/assets/empty-avatar.png"
+	} else {
+		discordAvatarURL = "https://cdn.discordapp.com/avatars/" + discord.Id + "/" + discord.Avatar + ".png?size=100"
+	}
+	tmpl := IndexStruct{DiscordName: discord.Username, DiscordAvatar: discordAvatarURL}
 	log.Println(token)
 	expiration := time.Now().Add(time.Hour)
 	cookie := http.Cookie{Name: "token", Value: token, Expires: expiration}