diff --git a/services/auth-app/pkg/command/create.go b/services/auth-app/pkg/command/create.go
index fc889cfd7..115f1600d 100644
--- a/services/auth-app/pkg/command/create.go
+++ b/services/auth-app/pkg/command/create.go
@@ -114,9 +114,9 @@ func Create(cfg *config.Config) *cobra.Command {
 		"",
 		"user to create the app-token for",
 	)
-	createCmd.Flags().String(
+	createCmd.Flags().Duration(
 		"expiration",
-		"72h",
+		time.Hour*72,
 		"expiration of the app password, e.g. 72h, 1h, 1m, 1s. Default is 72h.",
 	)
 
diff --git a/services/storage-users/pkg/command/trash_bin.go b/services/storage-users/pkg/command/trash_bin.go
index 50def1ab5..8c3b59f7c 100644
--- a/services/storage-users/pkg/command/trash_bin.go
+++ b/services/storage-users/pkg/command/trash_bin.go
@@ -191,8 +191,8 @@ func restoreAllTrashBinItems(cfg *config.Config) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			assumeYes, _ := cmd.Flags().GetBool("yes")
-			if !assumeYes {
+			applyYesFlag, _ := cmd.Flags().GetBool("yes")
+			if !applyYesFlag {
 				for {
 					fmt.Printf("Found %d items that could be restored, continue (Y/n), show the items list (s): ", len(res.GetRecycleItems()))
 					var i string