diff --git a/api/src/Etemplate/Widget/Select.php b/api/src/Etemplate/Widget/Select.php
index 3aab04f62c..a8bc248c44 100644
--- a/api/src/Etemplate/Widget/Select.php
+++ b/api/src/Etemplate/Widget/Select.php
@@ -716,11 +716,12 @@ class Select extends Etemplate\Widget
 				break;
 
 			case 'select-hour':
+				$minutes = !$type2 ? ':00' : '';
 				for ($h = 0; $h <= 23; ++$h)
 				{
 					$options[$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
-						(($h % 12 ? $h % 12 : 12).' '.($h < 12 ? lang('am') : lang('pm'))) :
-						sprintf('%02d',$h);
+						(($h % 12 ? $h % 12 : 12).$minutes.' '.($h < 12 ? lang('am') : lang('pm'))) :
+						sprintf('%02d',$h).$minutes;
 				}
 				$no_lang = True;
 				break;
diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index e22d28c60b..da049485e8 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -157,7 +157,7 @@ class calendar_hooks
 
 		if (!isset($hook_data['setup']))
 		{
-			$times = Api\Etemplate\Widget\Select::typeOptions('select-time', '');
+			$times = Api\Etemplate\Widget\Select::typeOptions('select-hour', '');
 		}
 		for ($i = 2; $i <= 4; ++$i)
 		{