diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 5353715b9..9a437f553 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -263,6 +263,11 @@
         }
     }
 
+  if (!identity)
+    {
+      identity = [[context activeUser] defaultIdentity];
+    }
+
   if (identity)
     {
       signature = [identity objectForKey: @"signature"];