diff --git a/src/Controllers/Common/RegistrationController.cs b/src/Controllers/Common/RegistrationController.cs
index 6f5dd51..9f84504 100644
--- a/src/Controllers/Common/RegistrationController.cs
+++ b/src/Controllers/Common/RegistrationController.cs
@@ -61,9 +61,12 @@ public class RegistrationController : Controller {
         };
 
         // Check if user exists
-        if (ctx.Users.Count(e => e.Email == u.Email) > 0 || ctx.Users.Count(e => e.Username== u.Username) > 0) {
+        if (ctx.Users.Count(e => e.Email == u.Email) > 0) {
             return Ok(new RegistrationResult { Status = MembershipUserStatus.DuplicateEmail });
         }
+        else if (ctx.Users.Count(e => e.Username== u.Username) > 0) {
+            return Ok(new RegistrationResult { Status = MembershipUserStatus.DuplicateUserName });
+        }  
 
         ctx.Users.Add(u);
         ctx.SaveChanges();