diff --git a/djangobb_forum/templates/djangobb_forum/profile/profile_personality.html b/djangobb_forum/templates/djangobb_forum/profile/profile_personality.html
index 39c987c..6e31d0a 100644
--- a/djangobb_forum/templates/djangobb_forum/profile/profile_personality.html
+++ b/djangobb_forum/templates/djangobb_forum/profile/profile_personality.html
@@ -23,12 +23,11 @@
 								{{ form.show_avatar.errors }}
 								<label>{{ form.show_avatar }}{% trans "Use avatar." %}<br></label>
 							</div>
-							{% if profile.forum_profile.avatar %}
-								<p class="clearb"><a href="{% url djangobb:forum_profile_upload_avatar profile.username %}">{% trans "Upload avatar" %}</a>
-								&nbsp;&nbsp;&nbsp;<a href="{% url djangobb:forum_profile_delete_avatar profile.username %}">{% trans "Delete avatar" %}</a></p>
-							{% else %}
-								<p class="clearb"><a href="{% url djangobb:forum_profile_upload_avatar profile.username %}">{% trans "Upload avatar" %}</a>
-							{% endif %}
+                            <p class="clearb"><a href="{% url djangobb:forum_profile_upload_avatar profile.username %}">{% trans "Upload avatar" %}</a>
+                                {% if profile.forum_profile.avatar %}
+                                &nbsp;&nbsp;&nbsp;<form action="{% url djangobb:forum_profile_delete_avatar profile.username %}" mothod="post"><button type="submit">{% trans "Delete avatar" %}</button></form></p>
+                                {% endif %}
+                            </p>
 						</div>
 					</fieldset>
 				</div>
diff --git a/djangobb_forum/views.py b/djangobb_forum/views.py
index 590fa51..d60f031 100644
--- a/djangobb_forum/views.py
+++ b/djangobb_forum/views.py
@@ -358,9 +358,10 @@ def upload_avatar(request, username, template=None, form_class=None):
 def delete_avatar(request, username, section=None, action=None, template=None, form_class=None):
     user = get_object_or_404(User, username=username)
     if request.user.is_authenticated() and user == request.user or request.user.is_superuser:
-        profile = get_object_or_404(Profile, user=request.user)
-        profile.avatar = None
-        profile.save()
+        if request.method == 'POST':
+            profile = user.forum_profile
+            profile.avatar = None
+            profile.save()
         return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
     else:
         topic_count = Topic.objects.filter(user__id=user.id).count()