diff --git a/asf-cloud-server/testarena_1/app/__init__.py b/asf-cloud-server/testarena_1/app/__init__.py
index 6e89d9b..9b8750d 100644
--- a/asf-cloud-server/testarena_1/app/__init__.py
+++ b/asf-cloud-server/testarena_1/app/__init__.py
@@ -37,10 +37,14 @@ def create_app():
     with app.app_context():
         db.create_all()
         # Create default admin user if not exists
-        if not User.query.filter_by(username='admin').first():
-            admin = User(username='admin', is_admin=True)
-            admin.set_password('admin123')
-            db.session.add(admin)
-            db.session.commit()
+        try:
+            if not User.query.filter_by(username='admin').first():
+                admin = User(username='admin', is_admin=True)
+                admin.set_password('admin123')
+                db.session.add(admin)
+                db.session.commit()
+        except Exception as e:
+            # Admin user might already exist, rollback and continue
+            db.session.rollback()
     
     return app