diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 1eb1f08f..a0125604 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -52,14 +52,14 @@ function admin_user()
             . '</p></td></tr>' . "\n";
         $html .= '  <tr><td>Name</td><td>' . '<input size="40" name="eName" value="' . $user_source['Name'] . '" class="form-control"></td></tr>' . "\n";
         $html .= '  <tr><td>Vorname</td><td>' . '<input size="40" name="eVorname" value="' . $user_source['Vorname'] . '" class="form-control"></td></tr>' . "\n";
-        $html .= '  <tr><td>Alter</td><td>' . '<input size="5" name="eAlter" value="' . $user_source['Alter'] . '" class="form-control"></td></tr>' . "\n";
-        $html .= '  <tr><td>Telefon</td><td>' . '<input size="40" name="eTelefon" value="' . $user_source['Telefon'] . '" class="form-control"></td></tr>' . "\n";
-        $html .= '  <tr><td>Handy</td><td>' . '<input size="40" name="eHandy" value="' . $user_source['Handy'] . '" class="form-control"></td></tr>' . "\n";
+        $html .= '  <tr><td>Alter</td><td>' . '<input type="value" size="5" name="eAlter" value="' . $user_source['Alter'] . '" class="form-control"></td></tr>' . "\n";
+        $html .= '  <tr><td>Telefon</td><td>' . '<input type="tel" size="40" name="eTelefon" value="' . $user_source['Telefon'] . '" class="form-control"></td></tr>' . "\n";
+        $html .= '  <tr><td>Handy</td><td>' . '<input type= "tel" size="40" name="eHandy" value="' . $user_source['Handy'] . '" class="form-control"></td></tr>' . "\n";
         $html .= '  <tr><td>DECT</td><td>' . '<input size="4" name="eDECT" value="' . $user_source['DECT'] . '" class="form-control"></td></tr>' . "\n";
         if ($user_source['email_by_human_allowed']) {
-            $html .= "  <tr><td>email</td><td>" . '<input size="40" name="eemail" value="' . $user_source['email'] . '" class="form-control"></td></tr>' . "\n";
+            $html .= "  <tr><td>email</td><td>" . '<input type="email" size="40" name="eemail" value="' . $user_source['email'] . '" class="form-control"></td></tr>' . "\n";
         }
-        $html .= "  <tr><td>jabber</td><td>" . '<input size="40" name="ejabber" value="' . $user_source['jabber'] . '" class="form-control"></td></tr>' . "\n";
+        $html .= "  <tr><td>jabber</td><td>" . '<input type="email" size="40" name="ejabber" value="' . $user_source['jabber'] . '" class="form-control"></td></tr>' . "\n";
         $html .= '  <tr><td>Size</td><td>'
             . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size'], __('Please select...')) . '</td></tr>' . "\n";
 
diff --git a/includes/sys_form.php b/includes/sys_form.php
index 73bfe895..edf9542a 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -71,7 +71,7 @@ function form_date($name, $label, $value, $start_date = '', $end_date = '')
 
     return form_element($label, '
     <div class="input-group date" id="' . $dom_id . '">
-      <input name="' . $name . '" class="form-control" value="' . htmlspecialchars($value) . '">'
+      <input type="date" name="' . $name . '" class="form-control" value="' . htmlspecialchars($value) . '">'
         . '<span class="input-group-addon">' . glyph('th') . '</span>
     </div>
     <script type="text/javascript">
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index 2fdade29..b1b7ac1a 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -19,7 +19,7 @@
             <div class="form-group">%start_select%</div>
             <div class="form-group">
                 <div class="input-group">
-                    <input class="form-control" id="start_time" name="start_time" size="5"
+                    <input type="time" class="form-control" id="start_time" name="start_time" size="5"
                            pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%">
                     <div class="input-group-btn">
                         <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('start');">
@@ -32,7 +32,7 @@
             <div class="form-group">%end_select%</div>
             <div class="form-group">
                 <div class="input-group">
-                    <input class="form-control" id="end_time" name="end_time" size="5"
+                    <input type="time" class="form-control" id="end_time" name="end_time" size="5"
                            pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%">
                     <div class="input-group-btn">
                         <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('end');">