diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 8592e87c52..5ba4a70ac1 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -14,6 +14,7 @@ HumHub Change Log
 - Fix: `I18N` formatter user timezone not set
 - Enh: Automatically set space default visibility in `Content::setContainer()`
 - Fix: Fixed ContentContainerSettingManager caching issue if space/user id are equal
+- Enh: Use of select2 dropdown for time zone selections
 
 1.2.1 (June 17, 2017)
 - Fix: Invite error in french language
diff --git a/protected/humhub/modules/admin/views/setting/basic.php b/protected/humhub/modules/admin/views/setting/basic.php
index 2a6fc1e3ee..af70138cba 100644
--- a/protected/humhub/modules/admin/views/setting/basic.php
+++ b/protected/humhub/modules/admin/views/setting/basic.php
@@ -1,5 +1,6 @@
 <?php
 
+use humhub\libs\TimezoneHelper;
 use yii\widgets\ActiveForm;
 use humhub\compat\CHtml;
 ?>
@@ -24,7 +25,7 @@ use humhub\compat\CHtml;
         <?= $languageDropDown = $form->field($model, 'defaultLanguage')->dropDownList($allowedLanguages, ['data-ui-select2' => '']); ?>
     <?php endif; ?>
 
-    <?= $form->field($model, 'timeZone')->dropDownList(\humhub\libs\TimezoneHelper::generateList()); ?>
+    <?= $form->field($model, 'timeZone')->dropDownList(TimezoneHelper::generateList(), ['data-ui-select2' => '']); ?>
 
     <?= humhub\modules\space\widgets\SpacePickerField::widget([
         'form' => $form,
diff --git a/protected/humhub/modules/user/views/account/editSettings.php b/protected/humhub/modules/user/views/account/editSettings.php
index 6c58a82b5e..8ff7b628e1 100644
--- a/protected/humhub/modules/user/views/account/editSettings.php
+++ b/protected/humhub/modules/user/views/account/editSettings.php
@@ -1,5 +1,6 @@
 <?php
 
+use humhub\libs\TimezoneHelper;
 use yii\widgets\ActiveForm;
 use \humhub\compat\CHtml;
 ?>
@@ -8,13 +9,13 @@ use \humhub\compat\CHtml;
 
 <?php $form = ActiveForm::begin(['id' => 'basic-settings-form']); ?>
 
-<?php echo $form->field($model, 'tags'); ?>
+<?= $form->field($model, 'tags'); ?>
 
 <?php if (count($languages) > 1) : ?>
-    <?php echo $form->field($model, 'language')->dropDownList($languages, ['data-ui-select2' => '']); ?>
+    <?= $form->field($model, 'language')->dropDownList($languages, ['data-ui-select2' => '']); ?>
 <?php endif; ?>
 
-<?php echo $form->field($model, 'timeZone')->dropDownList(\humhub\libs\TimezoneHelper::generateList()); ?>
+<?= $form->field($model, 'timeZone')->dropDownList(TimezoneHelper::generateList(), ['data-ui-select2' => '']); ?>
 
 <?php if (Yii::$app->getModule('user')->settings->get('auth.allowGuestAccess')): ?>
 
@@ -29,7 +30,7 @@ use \humhub\compat\CHtml;
 <?php endif; ?>
 
 <?php if (Yii::$app->getModule('tour')->settings->get('enable') == 1) : ?>
-    <?php echo $form->field($model, 'show_introduction_tour')->checkbox(); ?>
+    <?= $form->field($model, 'show_introduction_tour')->checkbox(); ?>
 <?php endif; ?>
 
 <button class="btn btn-primary" type="submit" data-ui-loader><?= Yii::t('UserModule.views_account_editSettings', 'Save') ?></button>