diff --git a/src/main/java/dslab/mailbox/DMAPConnection.java b/src/main/java/dslab/mailbox/DMAPConnection.java
index d135aa1..7730e5d 100644
--- a/src/main/java/dslab/mailbox/DMAPConnection.java
+++ b/src/main/java/dslab/mailbox/DMAPConnection.java
@@ -34,7 +34,6 @@ public class DMAPConnection implements Runnable {
             this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             out.println("ok DMAP");
             loginLoop();
-            out.println("ok");
 
             String userInput;
             while (!Thread.currentThread().isInterrupted() && (userInput = in.readLine()) != null) {
@@ -98,6 +97,7 @@ public class DMAPConnection implements Runnable {
                                     // Set current user if login successful
                                     currentUser = email;
                                     logger.info("User successfully logged in: " + currentUser.toString());
+                                    out.println("ok");
                                     return;
                                 }
                             }