diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index a8ef88fbe..35b73786b 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -506,11 +506,11 @@ class User implements UserInterface
      *
      * @return User
      */
-    public function setUsername($name)
+    public function setUsername(?string $name)
     {
-        $this->username = $name;
+        $this->username = (string) $name;
 
-        if (empty($this->getLabel())) {
+        if ("" === trim($this->getLabel())) {
             $this->setLabel($name);
         }