diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 4e692032..4df41da7 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -48,6 +48,7 @@ next (will be 1.8.0)
 * FEATURE: Import Sources now allows downloading previewed data as JSON (#2096)
 * FEATURE: REST API Import now allows custom headers (#2132)
 * FEATURE: REST API Import can now extract nested properties (#2132)
+* FEATURE: REST API Form remembers passwords without exposing them (#2070)
 * FEATURE: UTF8 validation for failed imports gives better error message (#2143)
 * FEATURE: ArrayByElementPosition now allows filtering by key name (#1721)
 * FEATURE: Use your Director Objects as an Import Source (#2198)
diff --git a/library/Director/Import/ImportSourceRestApi.php b/library/Director/Import/ImportSourceRestApi.php
index 8c998f91..dc772e1e 100644
--- a/library/Director/Import/ImportSourceRestApi.php
+++ b/library/Director/Import/ImportSourceRestApi.php
@@ -229,9 +229,9 @@ class ImportSourceRestApi extends ImportSourceHook
             ),
         ]);
 
-        $form->addElement('password', 'password', array(
+        $form->addElement('storedPassword', 'password', [
             'label' => $form->translate('Password'),
-        ));
+        ]);
     }
 
     /**
@@ -274,7 +274,7 @@ class ImportSourceRestApi extends ImportSourceHook
 
                 $passRequired = strlen($form->getSentOrObjectSetting('proxy_user')) > 0;
 
-                $form->addElement('password', 'proxy_pass', [
+                $form->addElement('storedPassword', 'proxy_pass', [
                     'label'    => $form->translate('Proxy Password'),
                     'required' => $passRequired
                 ]);