diff --git a/migrations/versions/002_add_user_roles.py b/migrations/versions/002_add_user_roles.py
index 454d843..947f1b2 100644
--- a/migrations/versions/002_add_user_roles.py
+++ b/migrations/versions/002_add_user_roles.py
@@ -20,7 +20,12 @@ def upgrade():
     # Add role column to users table
     with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.add_column(sa.Column('role', sa.Enum('admin', 'user', name='userrole'), nullable=True))
-        batch_op.execute("UPDATE users SET role = 'user' WHERE role IS NULL")
+    
+    # Update existing users to have the 'user' role
+    op.execute("UPDATE users SET role = 'user' WHERE role IS NULL")
+    
+    # Make the column non-nullable with a default value
+    with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.alter_column('role', nullable=False, server_default='user')