diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php
index 4b6aa9418c..baf2a92323 100644
--- a/phpgwapi/inc/class.accounts.inc.php
+++ b/phpgwapi/inc/class.accounts.inc.php
@@ -139,14 +139,14 @@ class accounts
 	 *
 	 * @return accounts
 	 */
-    public static function getInstance()
-    {
-        if (self::$_instance === NULL)
-        {
-            self::$_instance = new accounts;
-        }
-        return self::$_instance;
-    }
+	public static function getInstance()
+	{
+		if (self::$_instance === NULL)
+		{
+			self::$_instance = new accounts;
+		}
+		return self::$_instance;
+	}
 
 	/**
 	 * Constructor
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 2f31a88d4a..45c1085cad 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -215,7 +215,7 @@ class accounts_sql
 			}
 		}
 		// store group-email in mailaccounts table
-		if ($data['account_id'] < 0 && class_exists('emailadmin_smtp_sql', false))
+		if ($data['account_id'] < 0 && class_exists('emailadmin_smtp_sql', isset($data['account_email'])))
 		{
 			try {
 				if (empty($data['account_email']))
@@ -236,7 +236,7 @@ class accounts_sql
 				}
 			}
 			// ignore not (yet) existing mailaccounts table
-			catch (egw_exception_db $e) { }
+			catch (egw_exception_db $e) {}
 		}
 		return $data['account_id'];
 	}