diff --git a/store/routes.py b/store/routes.py
index e63b9cc3fd83d4fe3871c7446eac7ef1bccb2779..f4108d56ff31640a04119d7044f5eb58b24f82f7 100644
--- a/store/routes.py
+++ b/store/routes.py
@@ -112,14 +112,20 @@ def item_set_page(item_id):
 def register():
     form = RegistrationForm()
     if form.validate_on_submit():
-        flash("RAN")
-        user = User.create_user(
-            form.username.data,
-            form.password.data,
-            form.email.data,
-            form.phone_number.data,
-            form.securityQ1.data,
-        )
+        if User.checkIfUserExist(User, form.username.data):
+            error = "The username you chose is already taken."
+            return render_template(
+                "userContent/register.html", title="Register", error=error
+            )
+
+        else:
+            user = User.create_user(
+                form.username.data,
+                form.password.data,
+                form.email.data,
+                form.phone_number.data,
+                form.securityQ1.data,
+            )
 
         return redirect(url_for("index"))
     return render_template("userContent/register.html", form=form)
diff --git a/store/templates/items.html b/store/templates/items.html
index 7f7c46477394a56bd2b9967ae50fd9b506ac8d9d..0ed6553440a79b887412c8bf2fdae32de4c15686 100644
--- a/store/templates/items.html
+++ b/store/templates/items.html
@@ -52,4 +52,4 @@
   <p>No items available</p>
   {% endif %}
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file