default to saved identity if permittedHEADmaster

1 files changed, 6 insertions, 1 deletions

diff --git a/identity_addresses.php b/identity_addresses.php
index 5ddad7c..eac3216 100644
--- a/identity_addresses.php
+++ b/identity_addresses.php
@@ -14,8 +14,13 @@ class identity_addresses extends rcube_plugin {
     }
 
     function fix_form($params) {
-        $options = array($_SESSION['username'] => $_SESSION['username']);
+        $record = $params['record'];
+        $options = [];
         $permitted_addresses = $this->get_permitted_addresses();
+
+        if (!empty($record['email']) && in_array($record['email'], $permitted_addresses))
+            $options[$record['email']] = $record['email'];
+
         foreach ($permitted_addresses as $addr) {
             $options[$addr] = $addr;
         }