diff --git a/orm/user.py b/orm/user.py
index 7019e2e9..5ef9fb0b 100644
--- a/orm/user.py
+++ b/orm/user.py
@@ -10,7 +10,7 @@ class User(Base):
     __tablename__ = 'user'
 
     email: str = Column(String, nullable=False)
-    username: str = Column(String, nullable=True, comment="Name")
+    username: str = Column(String, nullable=False, comment="Name")
     password: str = Column(String, nullable=True, comment="Password")
 
     role_id: list = Column(ForeignKey("role.id"), nullable=True, comment="Role")
diff --git a/resolvers/auth.py b/resolvers/auth.py
index 0785882b..42fe2877 100644
--- a/resolvers/auth.py
+++ b/resolvers/auth.py
@@ -16,6 +16,7 @@ async def register(*_, email: str, password: str) -> User:
 	inp = { "email": email, "password": password}
 	create_user = CreateUser(**inp)
 	create_user.password = Password.encode(create_user.password)
+	create_user.username = email.split('@')[0]
 	user = User.create(**create_user.dict())
 	# if not password: # TODO: send confirmation email
 	token = await Authorize.authorize(user)