Index: main/pyfprint/trunk/enroll-script.py
===================================================================
--- main/pyfprint/trunk/enroll-script.py	(revision 11547)
+++ main/pyfprint/trunk/enroll-script.py	(revision 11548)
@@ -32,17 +32,16 @@
     """Get a student id via input from keyboard.
 
-    We require the id two times (for safety). The id must not be
-    empty.
+    We require the id two times (for safety). The id must have length 8.
     """
     while True:
         stud_id = raw_input("Please ENTER the STUDENT ID: ")
-        ctrl_id = raw_input("Please repeat              : ")
-        if not stud_id:
+        if len(stud_id) != 8:
             print "Please enter a valid student ID!"
-            stud_id = None
-        if stud_id != ctrl_id:
-            print "IDs do not match. We restart."
-        if stud_id and stud_id == ctrl_id:
-            return stud_id
+        else:
+            ctrl_id = raw_input("Please repeat              : ")
+            if stud_id != ctrl_id:
+                print "IDs do not match. We restart."
+            else:
+                return stud_id
 
 
