diff --git a/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java b/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java
index 98d4039..fb74170 100644
--- a/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java
+++ b/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java
@@ -50,7 +50,7 @@ public class SystemService {
 
         String email = "N/A";
         String username = "databasir";
-        Optional<UserPojo> userOpt = userDao.selectByEmail(email);
+        Optional<UserPojo> userOpt = userDao.selectByEmailOrUsername(username);
         if (!userOpt.isPresent()) {
             UserPojo admin = new UserPojo();
             admin.setEmail(email);