diff --git a/src/main/java/dev/service/AuthService.java b/src/main/java/dev/service/AuthService.java
index bee866a..9d2ea96 100644
--- a/src/main/java/dev/service/AuthService.java
+++ b/src/main/java/dev/service/AuthService.java
@@ -1,21 +1,48 @@
 package dev.service;
 
+import dev.dao.UserDao;
 import dev.model.User;
 
 public class AuthService {
 
+    private UserDao userDao = new UserDao();
+
     public boolean register(String username, String password, String email) {
 
-        // TODO:
-        // Validate and register user
+        if (username == null || username.isBlank()) {
+            return false;
+        }
 
-        return false;
+        if (password == null || password.isBlank()) {
+            return false;
+        }
+
+        User existingUser = userDao.findByUsername(username);
+
+        if (existingUser != null) {
+            return false;
+        }
+
+        User user = new User();
+
+        user.setUsername(username);
+        user.setPassword(password);
+        user.setEmail(email);
+
+        return userDao.save(user);
     }
 
     public User login(String username, String password) {
 
-        // TODO:
-        // Authenticate user
+        User user = userDao.findByUsername(username);
+
+        if (user == null) {
+            return null;
+        }
+
+        if (user.getPassword().equals(password)) {
+            return user;
+        }
 
         return null;
     }