diff --git a/amboar/obmc-scripts/netboot/netboot b/amboar/obmc-scripts/netboot/netboot
index 6843de8..85c9ecb 100755
--- a/amboar/obmc-scripts/netboot/netboot
+++ b/amboar/obmc-scripts/netboot/netboot
@@ -61,10 +61,12 @@
         i, m, d = conn.expect_or_raise([
             "%s login:" % (mach["platform"]),
             "root@%s:.*#" % (mach["platform"]),
+            "root@%s:.*#" % (args.machine),
             "ast#",
+            "# ",
         ], 5)
 
-        if i != 2:
+        if i != 3:
             if i == 0:
                 conn.encode_and_write(mach["user"])
                 conn.read_until(b"Password:")