diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 5319de2fe..cbbdf8c67 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -51,7 +51,16 @@
     return Message; // return constructor
   }];
 
-  /* Factory registration in Angular module */
+  /**
+   * @module SOGo.MailerUI
+   * @desc Factory registration of Message in Angular module.
+   */
+  try {
+    angular.module('SOGo.MailerUI');
+  }
+  catch(e) {
+    angular.module('SOGo.MailerUI', ['SOGo.Common']);
+  }
   angular.module('SOGo.MailerUI')
     .factory('Message', Message.$factory);
 
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 6ae0d76fc..d2a6e7a6e 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -69,6 +69,14 @@
     return new Preferences(); // return unique instance
   }];
 
+  /* Initialize module if necessary */
+  try {
+    angular.module('SOGo.PreferencesUI');
+  }
+  catch(e) {
+    angular.module('SOGo.PreferencesUI', ['SOGo.Common']);
+  }
+
   /* Factory registration in Angular module */
   angular.module('SOGo.PreferencesUI')
     .factory('Preferences', Preferences.$factory);