diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go
index 71ce7102fe..10abf6fa93 100644
--- a/ocis/pkg/command/accounts.go
+++ b/ocis/pkg/command/accounts.go
@@ -29,12 +29,7 @@ func AccountsCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureAccounts(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/common.go b/ocis/pkg/command/common.go
new file mode 100644
index 0000000000..3f599cdb10
--- /dev/null
+++ b/ocis/pkg/command/common.go
@@ -0,0 +1,14 @@
+package command
+
+import "github.com/micro/cli/v2"
+
+func handleOriginalAction(c *cli.Context, cmd *cli.Command) error {
+
+	if cmd.Before != nil {
+		if err := cmd.Before(c); err != nil {
+			return err
+		}
+	}
+
+	return cli.HandleAction(cmd.Action, c)
+}
diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go
index 7094c9b62a..31b3ca92bc 100644
--- a/ocis/pkg/command/glauth.go
+++ b/ocis/pkg/command/glauth.go
@@ -19,12 +19,7 @@ func GLAuthCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.ServerWithConfig(cfg.GLAuth),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureGLAuth(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go
index 646be8b7fc..7dab1f0a79 100644
--- a/ocis/pkg/command/ocs.go
+++ b/ocis/pkg/command/ocs.go
@@ -24,12 +24,7 @@ func OCSCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureOCS(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/onlyoffice.go b/ocis/pkg/command/onlyoffice.go
index 2b07f0624f..a326b53360 100644
--- a/ocis/pkg/command/onlyoffice.go
+++ b/ocis/pkg/command/onlyoffice.go
@@ -18,12 +18,7 @@ func OnlyofficeCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.ServerWithConfig(cfg.Onlyoffice),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureOnlyoffice(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go
index 1da074e8e0..71ba4ce12b 100644
--- a/ocis/pkg/command/proxy.go
+++ b/ocis/pkg/command/proxy.go
@@ -24,12 +24,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureProxy(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go
index bd4948ec1f..83722d1b5e 100644
--- a/ocis/pkg/command/settings.go
+++ b/ocis/pkg/command/settings.go
@@ -24,12 +24,7 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureSettings(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storageauthbasic.go b/ocis/pkg/command/storageauthbasic.go
index c5d6d315a7..c504d40a3a 100644
--- a/ocis/pkg/command/storageauthbasic.go
+++ b/ocis/pkg/command/storageauthbasic.go
@@ -20,12 +20,7 @@ func StorageAuthBasicCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.AuthBasicWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.AuthBasic(configureStorageAuthBasic(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storageauthbearer.go b/ocis/pkg/command/storageauthbearer.go
index 2609c44216..3aae7b2ef3 100644
--- a/ocis/pkg/command/storageauthbearer.go
+++ b/ocis/pkg/command/storageauthbearer.go
@@ -20,12 +20,7 @@ func StorageAuthBearerCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.AuthBearerWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.AuthBearer(configureStorageAuthBearer(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagefrontend.go b/ocis/pkg/command/storagefrontend.go
index 2c46f249fe..34774ea08e 100644
--- a/ocis/pkg/command/storagefrontend.go
+++ b/ocis/pkg/command/storagefrontend.go
@@ -20,12 +20,7 @@ func StorageFrontendCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.FrontendWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Frontend(configureStorageFrontend(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagegateway.go b/ocis/pkg/command/storagegateway.go
index 154a9ab147..2cb8efb9e7 100644
--- a/ocis/pkg/command/storagegateway.go
+++ b/ocis/pkg/command/storagegateway.go
@@ -20,12 +20,7 @@ func StorageGatewayCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.GatewayWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Gateway(configureStorageGateway(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagehome.go b/ocis/pkg/command/storagehome.go
index 011bb520a7..013ed03202 100644
--- a/ocis/pkg/command/storagehome.go
+++ b/ocis/pkg/command/storagehome.go
@@ -20,12 +20,7 @@ func StorageHomeCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.StorageHomeWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.StorageHome(configureStorageHome(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagemetadata.go b/ocis/pkg/command/storagemetadata.go
index 479537c2ae..b5c5dd9985 100644
--- a/ocis/pkg/command/storagemetadata.go
+++ b/ocis/pkg/command/storagemetadata.go
@@ -18,12 +18,7 @@ func StorageMetadataCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.StorageMetadata(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.StorageMetadata(configureStorageMetadata(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagepubliclink.go b/ocis/pkg/command/storagepubliclink.go
index a132bbf471..454811bfe9 100644
--- a/ocis/pkg/command/storagepubliclink.go
+++ b/ocis/pkg/command/storagepubliclink.go
@@ -20,12 +20,7 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.StoragePublicLink(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.StoragePublicLink(configureStoragePublicLink(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storagesharing.go b/ocis/pkg/command/storagesharing.go
index 1ac8b2cf4d..3f3476ecc3 100644
--- a/ocis/pkg/command/storagesharing.go
+++ b/ocis/pkg/command/storagesharing.go
@@ -20,12 +20,7 @@ func StorageSharingCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.SharingWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Sharing(configureStorageSharing(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storageuserprovider.go b/ocis/pkg/command/storageuserprovider.go
index 968cf41002..b5c09c5408 100644
--- a/ocis/pkg/command/storageuserprovider.go
+++ b/ocis/pkg/command/storageuserprovider.go
@@ -20,12 +20,7 @@ func StorageUserProviderCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.UsersWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Users(configureStorageUserProvider(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/storageusers.go b/ocis/pkg/command/storageusers.go
index 48dff5b259..b65e5b2cec 100644
--- a/ocis/pkg/command/storageusers.go
+++ b/ocis/pkg/command/storageusers.go
@@ -20,12 +20,7 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.StorageUsersWithConfig(cfg.Storage),
 		Action: func(c *cli.Context) error {
 			origCmd := command.StorageUsers(configureStorageUsers(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go
index bd52b86620..b10150d03b 100644
--- a/ocis/pkg/command/store.go
+++ b/ocis/pkg/command/store.go
@@ -24,12 +24,7 @@ func StoreCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureStore(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go
index 0903297352..90e2fd2614 100644
--- a/ocis/pkg/command/thumbnails.go
+++ b/ocis/pkg/command/thumbnails.go
@@ -25,12 +25,7 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureThumbnails(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go
index 19209af795..7858b67a0a 100644
--- a/ocis/pkg/command/web.go
+++ b/ocis/pkg/command/web.go
@@ -18,12 +18,7 @@ func WebCommand(cfg *config.Config) *cli.Command {
 		Flags:    flagset.ServerWithConfig(cfg.Web),
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureWeb(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
index 3dbc4e73e9..5d9459f083 100644
--- a/ocis/pkg/command/webdav.go
+++ b/ocis/pkg/command/webdav.go
@@ -24,12 +24,7 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			origCmd := command.Server(configureWebDAV(cfg))
-
-			if err := origCmd.Before(c); err != nil {
-				return err
-			}
-
-			return cli.HandleAction(origCmd.Action, c)
+			return handleOriginalAction(c, origCmd)
 		},
 	}
 }