diff --git a/authenticate.go b/authenticate.go
index 097afcb..d96823f 100644
--- a/authenticate.go
+++ b/authenticate.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"crypto/rsa"
 	"encoding/json"
 	"fmt"
 	"libshared"
@@ -21,6 +22,8 @@ type AuthenticateResponse struct {
 	Token string `json:"token"`
 }
 
+var privateKey *rsa.PrivateKey
+
 func authenticateHandler(w http.ResponseWriter, r *http.Request) {
 
 	var authenticaterequest AuthenticateRequest
@@ -29,7 +32,7 @@ func authenticateHandler(w http.ResponseWriter, r *http.Request) {
 	var hashText string
 	var ok bool
 	var token string
-	secret := []byte("super-secret-key")
+	//secret := []byte("super-secret-key")
 
 	w.Header().Set("Content-Type", "application/json")
 	// Only allow POST method
@@ -102,7 +105,7 @@ func authenticateHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err = createJWT(secret, fmt.Sprintf("%d", authenticaterequest.Accountid), authenticaterequest.Username, "user")
+	token, err = libshared.CreateJWT(privateKey, fmt.Sprintf("%d", authenticaterequest.Accountid), authenticaterequest.Username, "user")
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		apiresponse := libshared.NewAPIResponse("fail", "Failed to create JWT", AuthenticateResponse{})
diff --git a/jwt.go b/jwt.go
deleted file mode 100644
index 5b90c34..0000000
--- a/jwt.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import (
-	"time"
-
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// CreateJWT generates a signed JWT
-func createJWT(secret []byte, account string, user string, purpose string) (string, error) {
-	claims := jwt.MapClaims{
-		"sub":     user,                             // subject (user id)
-		"exp":     time.Now().Add(time.Hour).Unix(), // expiration
-		"iat":     time.Now().Unix(),                // issued at
-		"purpose": purpose,
-		"account": account,
-	}
-
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-
-	return token.SignedString(secret)
-}
diff --git a/main.go b/main.go
index 2772192..6776bcb 100644
--- a/main.go
+++ b/main.go
@@ -20,7 +20,13 @@ func decodeHash(encoded string) (*argonParams, []byte, []byte, error) {
 }
 
 func main() {
+	var err error
+
 	libshared.Pool = libshared.GetDbPool()
+	privateKey, err = libshared.LoadPrivateKey("keys/private.pem")
+	if err != nil {
+		log.Fatal("Failed to load private key:", err)
+	}
 
 	http.HandleFunc("/identity/create-local-identity", createLocalHandler)
 	http.HandleFunc("/identity/authenticate", authenticateHandler)