diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 6a8966d5..f06084cf 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -72,6 +72,7 @@ class calendar_ui
     $this->cal->register_handler('plugin.calendar_css', array($this, 'calendar_css'));
     $this->cal->register_handler('plugin.calendar_list', array($this, 'calendar_list'));
     $this->cal->register_handler('plugin.calendar_select', array($this, 'calendar_select'));
+    $this->cal->register_handler('plugin.identity_select', array($this, 'identity_select'));
     $this->cal->register_handler('plugin.category_select', array($this, 'category_select'));
     $this->cal->register_handler('plugin.freebusy_select', array($this, 'freebusy_select'));
     $this->cal->register_handler('plugin.priority_select', array($this, 'priority_select'));
@@ -260,6 +261,22 @@ class calendar_ui
     return $select->show(null);
   }
 
+  /**
+   * Render a HTML select box for user identity selection
+   */
+  function identity_select($attrib = array())
+  {
+    $attrib['name'] = 'identity';
+    $select         = new html_select($attrib);
+    $identities     = $this->rc->user->list_identities();
+
+    foreach ($identities as $id => $ident) {
+        $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);
+    }
+
+    return $select->show(null);
+  }
+
   /**
    * Render a HTML select box to select an event category
    */
diff --git a/plugins/calendar/skins/classic/templates/eventedit.html b/plugins/calendar/skins/classic/templates/eventedit.html
index 35484788..d889d57a 100644
--- a/plugins/calendar/skins/classic/templates/eventedit.html
+++ b/plugins/calendar/skins/classic/templates/eventedit.html
@@ -34,9 +34,9 @@
         <input type="text" name="enddate" size="10" id="edit-enddate" /> &nbsp;
         <input type="text" name="endtime" size="6"  id="edit-endtime" />
       </div>
-      <div class="event-section" id="edit-alarms">
-        <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-        <roundcube:object name="plugin.alarm_select" />
+      <div class="event-section" id="edit-identities">
+        <label for="edit-identity"><roundcube:label name="calendar.roleorganizer" /></label>
+        <roundcube:object name="plugin.identity_select" />
       </div>
       <div class="event-section" id="calendar-select">
         <label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
@@ -58,6 +58,10 @@
         <label for="edit-sensitivity"><roundcube:label name="calendar.sensitivity" /></label>
         <roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" />
       </div>
+      <div class="event-section" id="edit-alarms">
+        <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
+        <roundcube:object name="plugin.alarm_select" />
+      </div>
     </div>
     <!-- recurrence settings -->
     <div id="event-tab-2">
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 841baf74..66dc6497 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -31,9 +31,9 @@
 				<input type="text" name="enddate" size="10" id="edit-enddate" /> &nbsp;
 				<input type="text" name="endtime" size="6"	id="edit-endtime" />
 			</div>
-			<div class="event-section" id="edit-alarms">
-				<label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-				<roundcube:object name="plugin.alarm_select" />
+			<div class="event-section" id="edit-identities">
+				<label for="edit-identity"><roundcube:label name="calendar.roleorganizer" /></label>
+				<roundcube:object name="plugin.identity_select" />
 			</div>
 			<div class="event-section" id="calendar-select">
 				<label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
@@ -55,6 +55,10 @@
 				<label for="edit-sensitivity"><roundcube:label name="calendar.sensitivity" /></label>
 				<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" />
 			</div>
+			<div class="event-section" id="edit-alarms">
+				<label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
+				<roundcube:object name="plugin.alarm_select" />
+			</div>
 		</div>
 		<!-- recurrence settings -->
 		<div id="event-tab-2">