diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0ad1bb..2a27fa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
 # CHANGELOG
 
+
 ## 1.0.10 - Work In Progress
 - Enh #32: Added Italian Translation (maxxer)
+- Fix #30: Prefill username and email in SettingsForm (mattheobjornson)
 
 ## 1.0.9 - July 19, 2017
 - Enh #22: Added impersonation feature (@tonydspaniard)
diff --git a/src/User/Form/SettingsForm.php b/src/User/Form/SettingsForm.php
index 3236415..25a9b3d 100644
--- a/src/User/Form/SettingsForm.php
+++ b/src/User/Form/SettingsForm.php
@@ -51,6 +51,10 @@ class SettingsForm extends Model
     public function __construct(SecurityHelper $securityHelper, array $config = [])
     {
         $this->securityHelper = $securityHelper;
+        $config = [
+            'username' => $this->getUser()->username,
+            'email' => $this->getUser()->unconfirmed_email? : $this->getUser()->email
+        ];
         parent::__construct($config);
     }