diff --git a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/ManageDeviceDefaultUser.kt b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/ManageDeviceDefaultUser.kt
index bf723b7..9f6e04c 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/ManageDeviceDefaultUser.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/ManageDeviceDefaultUser.kt
@@ -81,7 +81,13 @@ object ManageDeviceDefaultUser {
             view.defaultUserSwitchText = if (defaultUserTimeout == 0)
                 context.getString(R.string.manage_device_default_user_timeout_off)
             else
-                context.getString(R.string.manage_device_default_user_timeout_on, TimeTextUtil.time(defaultUserTimeout, context))
+                context.getString(
+                        R.string.manage_device_default_user_timeout_on,
+                        if (defaultUserTimeout < 1000 * 60)
+                            TimeTextUtil.seconds(defaultUserTimeout / 1000, context)
+                        else
+                            TimeTextUtil.time(defaultUserTimeout, context)
+                )
         })
 
         auth.logic.fullVersion.shouldProvideFullVersionFunctions.observe(lifecycleOwner, Observer { fullVersion ->
diff --git a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/SetDeviceDefaultUserTimeoutDialogFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/SetDeviceDefaultUserTimeoutDialogFragment.kt
index 0f2cd18..d6c42e7 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/SetDeviceDefaultUserTimeoutDialogFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/SetDeviceDefaultUserTimeoutDialogFragment.kt
@@ -41,6 +41,7 @@ class SetDeviceDefaultUserTimeoutDialogFragment: BottomSheetDialogFragment() {
         private const val DIALOG_TAG = "sddutdf"
         private val OPTIONS = listOf(
                 0,
+                1000 * 5,
                 1000 * 60,
                 1000 * 60 * 5,
                 1000 * 60 * 15,
@@ -97,6 +98,8 @@ class SetDeviceDefaultUserTimeoutDialogFragment: BottomSheetDialogFragment() {
                 buildRow().let { row ->
                     row.text = if (option == 0)
                         getString(R.string.manage_device_default_user_timeout_dialog_disable)
+                    else if (option < 1000 * 60)
+                        TimeTextUtil.seconds(option / 1000, context!!)
                     else
                         TimeTextUtil.time(option, context!!)