diff --git a/Tweeder.py b/Tweeder.py
index 0d53139..159abb0 100644
--- a/Tweeder.py
+++ b/Tweeder.py
@@ -131,17 +131,22 @@ def user_settings():
         print(request.form)
         if 'username' not in session.keys():
             return redirect(url_for('login'))
-        profile = {
+        updated_profile = {
             'bio': request.form['bio'],
             'gender': request.form['gender'],
             'location': request.form['location']
         }
-        if 'profile-pic' in request.files.keys():
-            profile_pic = files.upload_file(request.files['profile_pic'])
-            profile['profile_pic'] = profile_pic
+        if 'profile_pic' in request.files.keys():
+            if request.files['profile_pic'].filename == '':
+                if accounts.account_details(session['username'].lower())['profile']['profile_pic']:
+                    profile_pic = accounts.account_details(session['username'].lower())['profile']['profile_pic']
+                    updated_profile['profile_pic'] = profile_pic
+            else:
+                profile_pic = files.upload_file(request.files['profile_pic'])
+                updated_profile['profile_pic'] = profile_pic
         accounts.set_theme(session['username'].lower(), request.form['theme'])
         username = session['username']
-        accounts.update_profile(username, profile)
+        accounts.update_profile(username, updated_profile)
         return redirect(request.referrer)
 
 
@@ -225,7 +230,7 @@ def unlike_post(post_id):
 @app.route("/files/<oid>", methods=['GET'])
 def get_file(oid):
     fl = files.get_file(oid)
-    if not fl: return "File not found"
+    if not fl: return abort(404)
     response = make_response(fl.read())
     response.mimetype = fl.content_type
     return response
diff --git a/templates/profile.html b/templates/profile.html
index 1febb76..2f30c0e 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -4,7 +4,7 @@
     <div class="container">
         <div class="jumbotron">
             {% if user.profile.profile_pic %}
-                <img src="/files/{{ user.profile.profile_pic }}" class="rounded-circle float-left" style="margin-right: 24px; max-height: 100px;"/>
+                <img src="/files/{{ user.profile.profile_pic }}" class="rounded float-left" style="margin-right: 24px; max-height: 100px;"/>
             {% endif %}
             <h1>{% if user.verified %} <i class="fas fa-shield-check" alt="Verified"></i> {% endif %}{{ user.displayname }} <small>on Tweeder</small></h1>
             <h2>
diff --git a/templates/settings.html b/templates/settings.html
index 275509d..eb8c8e0 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -6,7 +6,7 @@
         <form method="POST" action="/settings" class="col-lg-6" enctype="multipart/form-data">
             <div class="form-group row">
                 <h2>Profile Picture</h2>
-                    <input type="file" name="profile-pic" size="40">
+                    <input type="file" name="profile_pic" size="40">
                 <h2>Profile Fields</h2>
 
                 <div class="input-group mb-3">