diff --git a/db/postgresql/keys_and_index.sql b/db/postgresql/keys_and_index.sql
index cdc8da5adbbab25ed84e88d1ae0193b4ab57a6f5..8885ac9fd029bff6662fbf56a0905c71a68976df 100644
--- a/db/postgresql/keys_and_index.sql
+++ b/db/postgresql/keys_and_index.sql
@@ -494,7 +494,7 @@ ALTER TABLE ONLY study_form
 --
 
 ALTER TABLE ONLY study_groups
-    ADD CONSTRAINT study_groups_facultyid_gradeid_groupnum_key UNIQUE (facultyid, gradeid, groupnum);
+    ADD CONSTRAINT study_groups_facultyid_gradeid_groupnum_formid_key UNIQUE (facultyid, gradeid, groupnum, formid);
 
 
 --
diff --git a/db/postgresql/tables_and_views.sql b/db/postgresql/tables_and_views.sql
index d804387f8f039af0d6f9057ca7f6f589b768d9a7..50581fecbe97f3912de53a33571742604383bc97 100644
--- a/db/postgresql/tables_and_views.sql
+++ b/db/postgresql/tables_and_views.sql
@@ -936,7 +936,7 @@ CREATE TABLE study_groups (
     gradeid integer NOT NULL,
     groupnum integer NOT NULL,
     facultyid integer NOT NULL,
-    formid fulltime_parttime_evening DEFAULT fulltime NOT NULL
+    formid fulltime_parttime_evening DEFAULT 'fulltime' NOT NULL
 );