diff --git a/composer.lock b/composer.lock
index fe05d92..19dd2a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3487,27 +3487,19 @@
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
                 "shasum": ""
             },
-            "require": {
-                "php": ">=5.6"
-            },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -3526,7 +3518,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "socialconnect/auth",
@@ -6763,45 +6755,47 @@
         },
         {
             "name": "zendframework/zend-test",
-            "version": "2.5.3",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-test.git",
-                "reference": "e9c0a570d5519a85a4b15a58c30fbc04a33c45f5"
+                "reference": "0e2d81410af33c092a2916e77cbdfa3b6dc1bf1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-test/zipball/e9c0a570d5519a85a4b15a58c30fbc04a33c45f5",
-                "reference": "e9c0a570d5519a85a4b15a58c30fbc04a33c45f5",
+                "url": "https://api.github.com/repos/zendframework/zend-test/zipball/0e2d81410af33c092a2916e77cbdfa3b6dc1bf1b",
+                "reference": "0e2d81410af33c092a2916e77cbdfa3b6dc1bf1b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
-                "phpunit/phpunit": "~4.0|~5.0",
-                "zendframework/zend-console": "~2.5",
-                "zendframework/zend-dom": "~2.5",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-http": "~2.5",
-                "zendframework/zend-mvc": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-stdlib": "~2.5",
-                "zendframework/zend-uri": "~2.5",
-                "zendframework/zend-view": "~2.5"
+                "php": "^5.5 || ^7.0",
+                "phpunit/phpunit": "^4.0 || ^5.0",
+                "sebastian/version": "^1.0.4",
+                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-dom": "^2.6",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-mvc": "^2.7.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
+                "zendframework/zend-uri": "^2.5",
+                "zendframework/zend-view": "^2.6.3"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "1.7.*",
                 "mikey179/vfsstream": "~1.2",
-                "zendframework/zend-i18n": "~2.5",
-                "zendframework/zend-log": "~2.5",
-                "zendframework/zend-modulemanager": "~2.5",
-                "zendframework/zend-serializer": "~2.5",
-                "zendframework/zend-session": "~2.5"
+                "symfony/finder": "^2.2",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-log": "^2.7.1",
+                "zendframework/zend-modulemanager": "^2.7.1",
+                "zendframework/zend-serializer": "^2.6.1",
+                "zendframework/zend-session": "^2.6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
             "autoload": {
@@ -6818,7 +6812,7 @@
                 "test",
                 "zf2"
             ],
-            "time": "2016-03-01T20:28:49+00:00"
+            "time": "2016-03-02T20:15:27+00:00"
         },
         {
             "name": "zendframework/zend-text",
diff --git a/src/module/Phpug/config/module.config.php b/src/module/Phpug/config/module.config.php
index fc2ed25..9022e48 100644
--- a/src/module/Phpug/config/module.config.php
+++ b/src/module/Phpug/config/module.config.php
@@ -31,7 +31,9 @@
  */
 namespace Phpug;
 
+use Phpug\Form\UsergroupFieldset;
 use Phpug\Service\SlackInviteFormFactory;
+use Phpug\Service\UsergroupFieldsetFactory;
 
 return array(
     'router' => array(
@@ -480,6 +482,7 @@
             'roleManager' => 'Phpug\Service\RoleManagerFactory',
             'PromoteUsergroupForm' => 'Phpug\Service\PromoteUsergroupFormFactory',
             'UsergroupFieldset'    => 'Phpug\Service\UsergroupFieldsetFactory',
+            UsergroupFieldset::class => UsergroupFieldsetFactory::class,
             'SlackInviteForm'      => \Phpug\Service\SlackInviteFormFactory::class,
             'Phpug\Service\UsergroupMessage' => 'Phpug\Service\UsergroupMessageFactory',
             'Phpug\Service\Transport' => 'Phpug\Service\TransportFactory',
diff --git a/src/module/Phpug/src/Phpug/Acl/RoleManager.php b/src/module/Phpug/src/Phpug/Acl/RoleManager.php
index 2a50359..c3c8add 100644
--- a/src/module/Phpug/src/Phpug/Acl/RoleManager.php
+++ b/src/module/Phpug/src/Phpug/Acl/RoleManager.php
@@ -149,7 +149,7 @@ public function getRole()
             return $this->loggedInRole;
         }
 
-        if (! in_array($this->user->getDisplayName(), $this->admins[$this->user->getService()])) {
+        if (! in_array($this->user->getName(), $this->admins[$this->user->getService()])) {
             return $this->loggedInRole;
         }
 
diff --git a/src/module/Phpug/src/Phpug/Acl/UsersGroupAssertion.php b/src/module/Phpug/src/Phpug/Acl/UsersGroupAssertion.php
index b6c005d..8f366bc 100644
--- a/src/module/Phpug/src/Phpug/Acl/UsersGroupAssertion.php
+++ b/src/module/Phpug/src/Phpug/Acl/UsersGroupAssertion.php
@@ -102,7 +102,7 @@ public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $
             return false;
         }
         $service = strtolower($this->user->getService());
-        $uid     = strtolower($this->user->getDisplayName());
+        $uid     = strtolower($this->user->getName());
 
         foreach ($this->group->getContacts() as $contact) {
             if (strtolower($contact->getServiceName()) !== $service) {