diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 6dc54abde..b24f3b76e 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -3,7 +3,7 @@
 
 use \Exception;
 use Icinga\Application\Logger;
-use Icinga\Forms\Config\UserForm;
+use Icinga\Forms\Config\User\UserForm;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\User;
 use Icinga\Web\Controller\AuthBackendController;
diff --git a/application/forms/Config/UserForm.php b/application/forms/Config/User/UserForm.php
similarity index 99%
rename from application/forms/Config/UserForm.php
rename to application/forms/Config/User/UserForm.php
index cf3b7f083..765b95882 100644
--- a/application/forms/Config/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config;
+namespace Icinga\Forms\Config\User;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\RepositoryForm;