diff --git a/.mailmap b/.mailmap
index 8270e0c5c1c0..853a942e3332 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@
 <corywright@gmail.com> <cory.wright@rackspace.com>
 <dan@nicira.com> <danwent@dan-xs3-cs>
 <dan@nicira.com> <danwent@gmail.com>
+<derekh@redhat.com> <higginsd@gmail.com>
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <edouard1.thuleau@orange.com> <thuleau@gmail.com>
 <ewan.mellor@citrix.com> <emellor@silver>
diff --git a/Authors b/Authors
index 3f42459793b7..9995e58ac7c5 100644
--- a/Authors
+++ b/Authors
@@ -42,7 +42,7 @@ David Pravec <David.Pravec@danix.org>
 David Subiros <david.perez5@hp.com>
 Dean Troyer <dtroyer@gmail.com>
 Deepak Garg <deepak.garg@citrix.com>
-Derek Higgins <higginsd@gmail.com>
+Derek Higgins <derekh@redhat.com>
 Devdeep Singh <devdeep.singh@citrix.com>
 Devendra Modium <dmodium@isi.edu>
 Devin Carlen <devin.carlen@gmail.com>
diff --git a/bin/nova-manage b/bin/nova-manage
index a271cf2ff96e..49ec4165628c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -616,7 +616,7 @@ class ProjectCommands(object):
             print e
             print _("The above error may show that the certificate db has "
                     "not been created.\nPlease create a database by running "
-                    "a nova-api server on this host.")
+                    "a nova-cert server on this host.")
 
 AccountCommands = ProjectCommands