diff --git a/server/api/term.go b/server/api/term.go
index 9545ef24c..864989120 100644
--- a/server/api/term.go
+++ b/server/api/term.go
@@ -192,7 +192,7 @@ func (api WebTerminalApi) SshEndpoint(c echo.Context) error {
 
 		}
 	}
-	return err
+	return nil
 }
 
 func (api WebTerminalApi) SshMonitorEndpoint(c echo.Context) error {
diff --git a/server/service/session.go b/server/service/session.go
index cf43198de..b05209719 100644
--- a/server/service/session.go
+++ b/server/service/session.go
@@ -225,7 +225,7 @@ func (service sessionService) Decrypt(item *model.Session) error {
 }
 
 func (service sessionService) renderBoolToStr(b *bool) string {
-	if *(b) == true {
+	if *b {
 		return "1"
 	}
 	return "0"
diff --git a/server/utils/password.go b/server/utils/password.go
index 340b692a2..802b8f676 100644
--- a/server/utils/password.go
+++ b/server/utils/password.go
@@ -24,7 +24,7 @@ var Encoder = Bcrypt{
 }
 
 func GenPassword() string {
-	rand.Seed(time.Now().UnixNano())
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 	digits := "0123456789"
 	specials := "~=+%^*/()[]{}/!@#$?|"
 	all := "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
@@ -32,12 +32,12 @@ func GenPassword() string {
 		digits + specials
 	length := 8
 	buf := make([]byte, length)
-	buf[0] = digits[rand.Intn(len(digits))]
-	buf[1] = specials[rand.Intn(len(specials))]
+	buf[0] = digits[r.Intn(len(digits))]
+	buf[1] = specials[r.Intn(len(specials))]
 	for i := 2; i < length; i++ {
-		buf[i] = all[rand.Intn(len(all))]
+		buf[i] = all[r.Intn(len(all))]
 	}
-	rand.Shuffle(len(buf), func(i, j int) {
+	r.Shuffle(len(buf), func(i, j int) {
 		buf[i], buf[j] = buf[j], buf[i]
 	})
 	return string(buf)