diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index d79993de1..07212a019 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -768,7 +768,11 @@ iRANGE(2);
 
 - (NSString *) organizerName
 {
-  return [organizer mailAddress];
+  NSDictionary *profile;
+
+  profile = [[[self organizerProfile] allValues] lastObject];
+
+  return [profile objectForKey: @"name"];
 }
 
 // - (BOOL) canBeOrganizer
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index ce1644c18..499fe986a 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -68,8 +68,9 @@
       </span></span>
       <var:if condition="hasOrganizer"
 	><label id="organizerLabel"><var:string label:value="Organizer:"
-	    /><span class="content"><var:string
-	      value="organizerName"/></span></label>
+	    /><span class="content"><a var:href="organizer.email" var:email="organizer.email.rfc822Email"
+              ><var:string value="organizerName" /></a
+              ></span></label>
       </var:if>
       <!--<var:if condition="canBeOrganizer"
 	><label id="organizerListLabel"><var:string label:value="Organizer:"
@@ -214,7 +215,9 @@
   </label>
   <var:if condition="hasAttendees">
     <label id="organizerLabel"><var:string label:value="Organizer:"/>
-    <span class="content"><var:string value="organizerName"/></span>
+    <span class="content"><a var:href="organizer.email" var:email="organizer.email.rfc822Email"
+      ><var:string value="organizerName" /></a
+    ></span>
     </label>
   </var:if>
   <var:if condition="userHasRSVP">
diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index c6f0dfc46..526c88b76 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -111,10 +111,6 @@ SPAN.content > INPUT.textField
 LABEL#urlArea INPUT
 { position: static; }
 
-A#attendeesHref
-{ color: #00f;
-  text-decoration: underline; }
-
 DIV#attendeesMenu LI
 { padding-left: 10px;
   width: auto; }
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index 1e053f2fb..f6b1286f5 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -479,10 +479,7 @@ function setupAttendeeNode(aNode, aAttendee, isDelegate) {
 
 function initializeAttendeesHref() {
     var attendeesHref = $("attendeesHref");
-    var attendeesLabel = $("attendeesLabel");
-    var attendeesNames = $("attendeesNames");
-
-    if (attendeesHref && !attendeesHref.hasClassName ("nomenu"))
+    if (attendeesHref && !attendeesHref.hasClassName("nomenu"))
         attendeesHref.observe("click", onAttendeesHrefClick, false);
     refreshAttendees();
 }
@@ -525,9 +522,13 @@ function onAppointmentEditorLoad() {
         initTimeWidgets(widgets);
     }
 
+    var organizer = $("organizerLabel");
+    if (organizer && organizer.down("a")) {
+        organizer.down("a").on("click", onMailTo);
+    }
+
     // Extend JSON representation of attendees
     attendees = $H(attendees);
-
     initializeAttendeesHref();
 }
 
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 664ca2f65..f9a7e22f4 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -124,7 +124,6 @@ function initializeDocumentHref() {
     var documentUrl = $("attach");
 
     documentHref.observe("click", onPopupDocumentWindow, false);
-    documentHref.setStyle({ textDecoration: "underline", color: "#00f" });
     if (documentUrl.value.length > 0) {
         documentHref.appendChild(document.createTextNode(documentUrl.value));
         documentLabel.setStyle({ display: "block" });