diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index 16ba9f4ff..bbc801d8b 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,21 +1,23 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 CREATE TABLE `icingaweb_group`(
+  `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
   `ctime`  timestamp NULL DEFAULT NULL,
   `mtime`  timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`name`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `icingaweb_group_membership`(
-  `group_name` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `group_id`   int(10) unsigned NOT NULL,
   `username`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `ctime`      timestamp NULL DEFAULT NULL,
   `mtime`      timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`group_name`,`username`),
-  CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_name`)
-    REFERENCES `icingaweb_group` (`name`)
+  PRIMARY KEY (`group_id`,`username`),
+  CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`)
+    REFERENCES `icingaweb_group` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `icingaweb_user`(