diff --git a/composer.json b/composer.json
index 91af76e..65f1361 100644
--- a/composer.json
+++ b/composer.json
@@ -1,41 +1,36 @@
 {
-  "name": "userbase/client",
-  "description": "UserBase PHP Client: Identity + Login + Signup Service",
-  "homepage": "http://www.github.com/userbase-project/userbase-client-php",
-  "keywords": [
-    "login",
-    "signup",
-    "user",
-    "account"
-  ],
-  "type": "library",
-  "authors": [
-    {
-      "name": "Joost Faassen",
-      "email": "j.faassen@linkorb.com",
-      "role": "Development"
+    "name": "userbase/client",
+    "description": "UserBase PHP Client: Identity + Login + Signup Service",
+    "homepage": "http://www.github.com/userbase-project/userbase-client-php",
+    "keywords": ["login", "signup", "user", "account"],
+    "type": "library",
+    "authors": [
+        {
+            "name": "Joost Faassen",
+            "email": "j.faassen@linkorb.com",
+            "role": "Development"
+        },
+        {
+            "name": "kaushik prajapati",
+            "email": "prajapatikaushik@gmail.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "linkorb/envoi": "^1.0",
+        "linkorb/userbase-role-contracts": "^2.0",
+        "psr/cache": "~1.0",
+        "symfony/cache": "~3.0 || ^4.0 || ^5.0",
+        "symfony/event-dispatcher-contracts": "^2.0",
+        "symfony/security-core": "~2.6 || ~3.0 || ^4.0 || ^5.0"
     },
-    {
-      "name": "kaushik prajapati",
-      "email": "prajapatikaushik@gmail.com",
-      "role": "Developer"
-    }
-  ],
-  "require": {
-    "php": ">=5.3.0",
-    "linkorb/envoi": "^1.0",
-    "linkorb/userbase-role-contracts": "^2.0",
-    "psr/cache": "~1.0",
-    "symfony/cache": "~3.0 || ^4.0 || ^5.0 || ^6.0",
-    "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
-    "symfony/security-core": "~2.6 || ~3.0 || ^4.0 || ^5.0 || ^6.0"
-  },
-  "require-dev": {
-    "symfony/dotenv": "~3.0 || ^4.0 || ^5.0 || ^6.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "UserBase\\Client\\": "src/"
+    "require-dev": {
+      "symfony/dotenv": "~3.0 || ^4.0 || ^5.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "UserBase\\Client\\": "src/"
+        }
     }
-  }
 }
diff --git a/src/Event/UserLoadedEvent.php b/src/Event/UserLoadedEvent.php
index 30a946b..f8f1819 100644
--- a/src/Event/UserLoadedEvent.php
+++ b/src/Event/UserLoadedEvent.php
@@ -2,7 +2,6 @@
 
 namespace UserBase\Client\Event;
 
-
 use Symfony\Contracts\EventDispatcher\Event;
 use UserBase\Client\Model\User;
 
diff --git a/src/Model/User.php b/src/Model/User.php
index 329bf28..154a2a3 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -2,11 +2,9 @@
 
 namespace UserBase\Client\Model;
 
-use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
-use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
-use Symfony\Component\Security\Core\User\LegacyPasswordAuthenticatedUserInterface;
-use RuntimeException;
 use LinkORB\Contracts\UserbaseRole\RoleInterface;
+use RuntimeException;
+use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
 
 final class User implements
     AccountContainerInterface,
@@ -14,8 +12,7 @@ final class User implements
     LegacyAdvancedUserInterface,
     PolicyContainerInterface,
     RoleInterface,
-    UserInterface,
-    LegacyPasswordAuthenticatedUserInterface
+    UserInterface
 {
     /**
      * @deprecated
@@ -105,9 +102,8 @@ public function getRoles()
 
     /**
      * {@inheritdoc}
-     *  @see PasswordAuthenticatedUserInterface
      */
-    public function getPassword(): ?string
+    public function getPassword()
     {
         return $this->password;
     }
@@ -121,7 +117,7 @@ public function setPassword($password)
     /**
      * {@inheritdoc}
      */
-    public function getSalt(): ?string
+    public function getSalt()
     {
         return $this->salt;
     }