diff --git a/advlabdb/utils.py b/advlabdb/utils.py
index c304a84..b70a787 100644
--- a/advlabdb/utils.py
+++ b/advlabdb/utils.py
@@ -13,7 +13,7 @@ def randomPassword():
 
 
 def userActiveSemester(flashWarning=False):
-    lastSemesterId = Semester.query.order_by(Semester.year.desc()).order_by(Semester.id.desc()).first().id
+    lastSemesterId = Semester.query.order_by(Semester.year.desc()).order_by(Semester.label.desc()).first().id
     if current_user.active_semester_id is None:
         current_user.active_semester_id = lastSemesterId
         db.session.commit()
diff --git a/testDB.py b/testDB.py
index e02d463..7b083b2 100644
--- a/testDB.py
+++ b/testDB.py
@@ -17,8 +17,8 @@ with app.app_context():
     db.session.add(program2)
     db.session.add(program3)
 
-    sem1 = Semester(label="WS", year=21)
-    sem2 = Semester(label="SS", year=21)
+    sem1 = Semester(label="SS", year=22)
+    sem2 = Semester(label="WS", year=22)
 
     db.session.add(sem1)
     db.session.add(sem2)