diff --git a/drama/routes/users.py b/drama/routes/users.py
index 69d378ac5..b8b7fafaf 100644
--- a/drama/routes/users.py
+++ b/drama/routes/users.py
@@ -483,20 +483,14 @@ def unfollow_user(username, v):
 	return "", 204
 
 
-@app.route("/@<username>/pic/profile")
+@app.route("/uid/<id>/pic/profile")
 @limiter.exempt
-def user_profile(username):
-	x = get_user(username)
-	return redirect(x.profile_url)
-
-@app.route("/uid/<uid>/pic/profile")
-@limiter.exempt
-def user_profile_uid(uid):
-	try: uid = int(uid)
+def user_profile_uid(id):
+	try: id = int(id)
 	except:
-		try: uid = int(uid, 36)
+		try: id = int(id, 36)
 		except: abort(404)
-	x=get_account(uid)
+	x=get_account(id)
 	return redirect(x.profile_url)
 
 
diff --git a/drama/templates/badmins.html b/drama/templates/badmins.html
index 1feff35c7..fe0bf7c7b 100644
--- a/drama/templates/badmins.html
+++ b/drama/templates/badmins.html
@@ -15,7 +15,7 @@
 </thead>
 {% for user in badmins %}
 	<tr>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
 	</tr>
 {% endfor %}
diff --git a/drama/templates/banned.html b/drama/templates/banned.html
index c418f6898..3ebac6bd6 100644
--- a/drama/templates/banned.html
+++ b/drama/templates/banned.html
@@ -13,9 +13,9 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{users.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold;">{% if user.ban_reason %}{{user.ban_reason}}{% endif %}</td>
-		<td>{% if user.banned_by %}<a {% if user.banned_by.animatedname %}class="{% if user.banned_by.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.banned_by.namecolor}}; font-weight:bold;" href="/@{{user.banned_by.username}}"><img src="/@{{user.banned_by.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.banned_by.username}}</a>{% endif %}</td>
+		<td>{% if user.banned_by %}<a {% if user.banned_by.animatedname %}class="{% if user.banned_by.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.banned_by.namecolor}}; font-weight:bold;" href="/@{{user.banned_by.username}}"><img src="/uid/{{user.banned_by.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.banned_by.username}}</a>{% endif %}</td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/drama/templates/followers.html b/drama/templates/followers.html
index 1eb56e8a5..8e068b02b 100644
--- a/drama/templates/followers.html
+++ b/drama/templates/followers.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{users.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/drama/templates/leaderboard.html b/drama/templates/leaderboard.html
index 60c0f4135..cb4554bef 100644
--- a/drama/templates/leaderboard.html
+++ b/drama/templates/leaderboard.html
@@ -17,7 +17,7 @@
 {% for user in users1 %}
 	<tr>
 		<td style="font-weight:bold;">{{users1.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
 	</tr>
 {% endfor %}
@@ -42,7 +42,7 @@
 {% for user in users2 %}
 	<tr>
 		<td style="font-weight:bold;">{{users2.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.stored_subscriber_count}}</td>
 	</tr>
 {% endfor %}
@@ -67,7 +67,7 @@
 {% for user in users3 %}
 	<tr>
 		<td style="font-weight:bold;">{{users3.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.post_count}}</td>
 	</tr>
 {% endfor %}
@@ -92,7 +92,7 @@
 {% for user in users4 %}
 	<tr>
 		<td style="font-weight:bold;">{{users4.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold; fonts" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold; fonts" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.comment_count}}</td>
 	</tr>
 {% endfor %}
diff --git a/drama/templates/patrons.html b/drama/templates/patrons.html
index 3dfad832c..3aa67f04a 100644
--- a/drama/templates/patrons.html
+++ b/drama/templates/patrons.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{users.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 
 		<td><img style="width: 32px; height: 32px" src="/assets/images/badges/patron-{{user.patron}}.gif"></td>
 
diff --git a/drama/templates/rentoids.html b/drama/templates/rentoids.html
index 1cf74f118..3002bacf1 100644
--- a/drama/templates/rentoids.html
+++ b/drama/templates/rentoids.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{users.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/drama/templates/viewers.html b/drama/templates/viewers.html
index e32380488..5e7ccbef9 100644
--- a/drama/templates/viewers.html
+++ b/drama/templates/viewers.html
@@ -12,7 +12,7 @@
 </thead>
 {% for view in viewers %}
 	<tr>
-        <td style="font-weight: bold"><a {% if view.viewer.animatedname %}class="{% if view.viewer.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/@{{view.viewer.username}}/pic/profile" class="profile-pic-20 mr-1">{{view.viewer.username}}</a></td>
+        <td style="font-weight: bold"><a {% if view.viewer.animatedname %}class="{% if view.viewer.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/uid/{{view.viewer.id}}/pic/profile" class="profile-pic-20 mr-1">{{view.viewer.username}}</a></td>
         <td style="font-weight: bold">{{view.last_view_string}}</td>
 	</tr>
 {% endfor %}
diff --git a/drama/templates/votes.html b/drama/templates/votes.html
index 194da1eb6..f216d209f 100644
--- a/drama/templates/votes.html
+++ b/drama/templates/votes.html
@@ -28,7 +28,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in ups %}
-		<tr><td><a {% if vote.user.animatedname %}class="{% if vote.user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{vote.user.namecolor}}; font-weight:bold;" href="/@{{vote.user.username}}"><img src="/@{{vote.user.username}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
+		<tr><td><a {% if vote.user.animatedname %}class="{% if vote.user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{vote.user.namecolor}}; font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
 	{% endfor %}
 </table>
 
@@ -37,7 +37,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in downs %}
-		<tr><td><a {% if vote.user.animatedname %}class="{% if vote.user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{vote.user.namecolor}}; font-weight:bold;" href="/@{{vote.user.username}}"><img src="/@{{vote.user.username}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
+		<tr><td><a {% if vote.user.animatedname %}class="{% if vote.user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{vote.user.namecolor}}; font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
 	{% endfor %}
 </table>