diff --git a/src/Controller/Security.php b/src/Controller/Security.php
index 8703474acb..67a86ec810 100644
--- a/src/Controller/Security.php
+++ b/src/Controller/Security.php
@@ -17,7 +17,7 @@ use app\Util\Common;
 use App\Util\Exception\EmailTakenException;
 use App\Util\Exception\NicknameTakenException;
 use App\Util\Exception\ServerException;
-use App\Util\FormFields;
+use App\Util\Form\FormFields;
 use App\Util\Nickname;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php
index 63dbad63c8..073e534729 100644
--- a/src/Controller/UserPanel.php
+++ b/src/Controller/UserPanel.php
@@ -41,6 +41,8 @@ use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use App\Util\Form\ArrayTransformer;
+use App\Util\Form\FormFields;
+use App\Util\Formatting;
 use Doctrine\DBAL\Types\Types;
 use Exception;
 use Functional as F;
diff --git a/src/Util/FormFields.php b/src/Util/Form/FormFields.php
similarity index 98%
rename from src/Util/FormFields.php
rename to src/Util/Form/FormFields.php
index 96cb2ff36d..4e2587fa42 100644
--- a/src/Util/FormFields.php
+++ b/src/Util/Form/FormFields.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Util;
+namespace App\Util\Form;
 
 use function App\Core\I18n\_m;
+use App\Util\Common;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Validator\Constraints\Length;