diff --git a/protected/humhub/config/common.php b/protected/humhub/config/common.php
index af884313a0..b20a5ae505 100644
--- a/protected/humhub/config/common.php
+++ b/protected/humhub/config/common.php
@@ -12,7 +12,7 @@ Yii::setAlias('@config', '@app/config');
 
 $config = [
     'name' => 'HumHub',
-    'version' => '1.2.3',
+    'version' => '1.2.4',
     'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR,
     'bootstrap' => ['log', 'humhub\components\bootstrap\ModuleAutoLoader', 'queue'],
     'sourceLanguage' => 'en',
diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 3be7dab427..dfbe6467dd 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -2,8 +2,10 @@ HumHub Change Log
 =================
 
 
-1.2.4
--------------------------
+1.2.4  (December 13, 2017)
+--------------------------
+
+- Enh: Translation updates
 - Fix: Added `ManageSpaces` and SystemAdmin check to `UserGroupAccessValidator`.
 - Fix: Only include content with `stream_channel = default` into spacechooser update count.
 - Enh: Add LinkedIn auth to login. (Felli)
@@ -18,6 +20,8 @@ HumHub Change Log
 - Enh: Added configuration option to include user profile posts in dashboard without following
 - Fix: User profile sidebar disappered
 - Fix: Like notification for comments not working
+- Fix: Add example users to default Users group
+
 
 1.2.3  (October 23, 2017)
 -------------------------
diff --git a/protected/humhub/modules/user/models/Group.php b/protected/humhub/modules/user/models/Group.php
index 4d12b4c8a7..cec3c3d648 100644
--- a/protected/humhub/modules/user/models/Group.php
+++ b/protected/humhub/modules/user/models/Group.php
@@ -2,7 +2,7 @@
 
 /**
  * @link https://www.humhub.org/
- * @copyright Copyright (c) 2016 HumHub GmbH & Co. KG
+ * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
  * @license https://www.humhub.com/licences
  */
 
@@ -22,6 +22,8 @@ use humhub\modules\space\models\Space;
  * @property string $created_at
  * @property integer $created_by
  * @property integer $sort_order
+ * @property integer $show_at_directory
+ * @property integer $show_at_registration
  * @property string $updated_at
  * @property integer $updated_by
  */