diff --git a/bindata/bindata.go b/bindata/bindata.go
index 97803e6..dc8d45c 100644
--- a/bindata/bindata.go
+++ b/bindata/bindata.go
@@ -93,7 +93,7 @@ func templateAuthSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2503, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
+	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2503, mode: os.FileMode(420), modTime: time.Unix(1508242827, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -113,7 +113,7 @@ func templateBundleJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/bundle.js", size: 298347, mode: os.FileMode(420), modTime: time.Unix(1508158530, 0)}
+	info := bindataFileInfo{name: "template/bundle.js", size: 298347, mode: os.FileMode(420), modTime: time.Unix(1508242841, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -193,7 +193,7 @@ func templateIndexHtml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/index.html", size: 577, mode: os.FileMode(420), modTime: time.Unix(1508158530, 0)}
+	info := bindataFileInfo{name: "template/index.html", size: 577, mode: os.FileMode(420), modTime: time.Unix(1508242841, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -233,7 +233,7 @@ func templateNetworkSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
+	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1508242827, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -273,7 +273,7 @@ func templateUserSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/user.swagger.json", size: 6556, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
+	info := bindataFileInfo{name: "template/user.swagger.json", size: 6556, mode: os.FileMode(420), modTime: time.Unix(1508242827, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -293,7 +293,7 @@ func templateVpnSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3732, mode: os.FileMode(420), modTime: time.Unix(1508158520, 0)}
+	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3732, mode: os.FileMode(420), modTime: time.Unix(1508242827, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/cmd/ovpm/user_test.go b/cmd/ovpm/user_test.go
index ced0634..5351c5b 100644
--- a/cmd/ovpm/user_test.go
+++ b/cmd/ovpm/user_test.go
@@ -41,3 +41,133 @@ func TestUserCmd(t *testing.T) {
 		t.Fatal("subcommand missing 'update, u'")
 	}
 }
+
+func TestUserCreateCmd(t *testing.T) {
+	app := NewApp()
+
+	output := new(bytes.Buffer)
+	app.Writer = output
+
+	var err error
+
+	// Empty call
+	err = app.Run([]string{"ovpm", "user", "create"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+
+	// Missing password
+	err = app.Run([]string{"ovpm", "user", "create", "--username", "sad"})
+	if err == nil {
+		t.Fatal("error is expected about missing password, but we didn't got error")
+	}
+
+	// Missing username
+	err = app.Run([]string{"ovpm", "user", "create", "--password", "sad"})
+	if err == nil {
+		t.Fatal("error is expected about missing password, but we didn't got error")
+	}
+
+	// Malformed static ip
+	err = app.Run([]string{"ovpm", "user", "create", "--username", "sad", "--password", "asdf", "--static", "asdf"})
+	if err == nil {
+		t.Fatal("error is expected about malformed static ip, but we didn't got error")
+	}
+
+	// Ensure proper static ip
+	err = app.Run([]string{"ovpm", "user", "create", "--username", "adsf", "--password", "1234", "--static", "10.9.0.4"})
+	if err != nil && !strings.Contains(err.Error(), "grpc") {
+		t.Fatalf("error is not expected: %v", err)
+	}
+
+	// Ensure username chars
+	err = app.Run([]string{"ovpm", "user", "create", "--username", "sdafADSFasdf325235.dsafsaf-asdffdsa_h5223s", "--password", "1234", "--static", "10.9.0.4"})
+	if err != nil && !strings.Contains(err.Error(), "grpc") {
+		t.Fatalf("error is not expected: %v", err)
+	}
+
+}
+
+func TestUserUpdateCmd(t *testing.T) {
+	app := NewApp()
+
+	output := new(bytes.Buffer)
+	app.Writer = output
+
+	var err error
+
+	// Empty call
+	err = app.Run([]string{"ovpm", "user", "update"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+
+	// Ensure missing fields
+	err = app.Run([]string{"ovpm", "user", "update", "--username", "foobar"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+
+	// Mix gw with no-gw
+	err = app.Run([]string{"ovpm", "user", "update", "--no-gw", "--gw"})
+	if err == nil {
+		t.Fatal("error is expected about gw mutually exclusivity, but we didn't got error")
+	}
+
+	// Mix admin with no-admin
+	err = app.Run([]string{"ovpm", "user", "update", "--admin", "--no-admin"})
+	if err == nil {
+		t.Fatal("error is expected about admin mutually exclusivity, but we didn't got error")
+	}
+
+	// Malformed static
+	err = app.Run([]string{"ovpm", "user", "update", "--username", "foo", "--static", "sadfsadf"})
+	if err == nil {
+		t.Fatal("error is expected about static being malformed ip, but we didn't got error")
+	}
+}
+
+func TestUserDeleteCmd(t *testing.T) {
+	app := NewApp()
+
+	output := new(bytes.Buffer)
+	app.Writer = output
+
+	var err error
+
+	// Empty call
+	err = app.Run([]string{"ovpm", "user", "delete"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+}
+
+func TestUserRenewCmd(t *testing.T) {
+	app := NewApp()
+
+	output := new(bytes.Buffer)
+	app.Writer = output
+
+	var err error
+
+	// Empty call
+	err = app.Run([]string{"ovpm", "user", "renew"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+}
+
+func TestUserGenconfigCmd(t *testing.T) {
+	app := NewApp()
+
+	output := new(bytes.Buffer)
+	app.Writer = output
+
+	var err error
+
+	// Empty call
+	err = app.Run([]string{"ovpm", "user", "delete"})
+	if err == nil {
+		t.Fatal("error is expected about missing fields, but we didn't got error")
+	}
+}