diff --git a/src/metabase/email/messages.clj b/src/metabase/email/messages.clj
index 45221c6cfb280753c760de79b95dea1522a53023..63db8dacb9a4cb54ceb5d119d094946914e5d1d6 100644
--- a/src/metabase/email/messages.clj
+++ b/src/metabase/email/messages.clj
@@ -69,9 +69,9 @@
                        :joinedUserName    (:first_name new-user)
                        :joinedViaSSO      google-auth?
                        :joinedUserEmail   (:email new-user)
-                       :joinedDate        (u/format-date "hh:mm") ; TODO - is this what we want?
+                       :joinedDate        (u/format-date "EEEE, MMMM d") ; e.g. "Wednesday, July 13". TODO - is this what we want?
                        :invitorEmail      (:email invitor)
-                       :joinedUserEditUrl (str (setting/get :-site-url) "/admin/people")}))))
+                       :joinedUserEditUrl (str (setting/get :-site-url) "/admin/people")})))) ;
 
 
 (defn send-password-reset-email
@@ -144,10 +144,10 @@
                               :quotation       (:quote data-quote)
                               :quotationAuthor (:author data-quote)}
                              (if (= "abandon" msg-type)
-                               {:heading "We’d love your feedback."
+                               {:heading      "We’d love your feedback."
                                 :callToAction "It looks like Metabase wasn’t quite a match for you. Would you mind taking a fast 5 question survey to help the Metabase team understand why and make things better in the future?"
                                 :link         "http://www.metabase.com/feedback/inactive"}
-                               {:heading "We hope you've been enjoying Metabase."
+                               {:heading      "We hope you've been enjoying Metabase."
                                 :callToAction "Would you mind taking a fast 6 question survey to tell us how it’s going?"
                                 :link         "http://www.metabase.com/feedback/active"}))
         message-body  (stencil/render-file "metabase/email/follow_up_email" context)]
diff --git a/src/metabase/email/user_joined_notification.mustache b/src/metabase/email/user_joined_notification.mustache
index 4e1dcf458e914a25250053304dae8c112717b649..d86ac2fdda341f24589541222677dedad9a55ce7 100644
--- a/src/metabase/email/user_joined_notification.mustache
+++ b/src/metabase/email/user_joined_notification.mustache
@@ -10,7 +10,7 @@
         <a style="color: #4A90E2; text-decoration: none;" href="mailto:{{invitorEmail}}">
           {{joinedUserEmail}}
         </a>
-        joined {{#joinedViaSSO}}via Google Auth{{/joinedViaSSO}} at {{joinedDate}}
+        joined {{#joinedViaSSO}}via Google Auth{{/joinedViaSSO}} on {{joinedDate}}
       </h4>
     </div>
     <div style="padding: 1em;">
diff --git a/src/metabase/util.clj b/src/metabase/util.clj
index d933b3e449ef902529dd318c9d6b5563fd5a1617..d910da46dd542fc3256f898684bd8bcbf5f85da3 100644
--- a/src/metabase/util.clj
+++ b/src/metabase/util.clj
@@ -114,7 +114,7 @@
   (^String [date-format]
    (format-date date-format (System/currentTimeMillis)))
   (^String [date-format date]
-   (time/unparse (->DateTimeFormatter date-format) (coerce/from-long (.getTime (->Timestamp date))))))
+   (time/unparse (->DateTimeFormatter date-format) (coerce/from-sql-time (->Timestamp date)))))
 
 (def ^{:arglists '([] [date])} date->iso-8601
   "Format DATE a an ISO-8601 string."