diff --git a/auth/auth.go b/auth/auth.go
new file mode 100644
index 0000000..66fd1e9
--- /dev/null
+++ b/auth/auth.go
@@ -0,0 +1,329 @@
+package auth
+
+import (
+	"context"
+	"crypto/ed25519"
+	"crypto/rand"
+	"database/sql"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/ClusterCockpit/cc-jobarchive/templates"
+	sq "github.com/Masterminds/squirrel"
+	"github.com/golang-jwt/jwt/v4"
+	"github.com/gorilla/sessions"
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/crypto/bcrypt"
+)
+
+type User struct {
+	Username string
+	Password string
+	Name     string
+	IsAdmin  bool
+	ViaLdap  bool
+	Email    string
+}
+
+type ContextKey string
+
+const ContextUserKey ContextKey = "user"
+
+var JwtPublicKey ed25519.PublicKey
+var JwtPrivateKey ed25519.PrivateKey
+
+var sessionStore *sessions.CookieStore
+
+func Init(db *sqlx.DB, ldapConfig *LdapConfig) error {
+	_, err := db.Exec(`
+	CREATE TABLE IF NOT EXISTS user (
+		username varchar(255) PRIMARY KEY,
+		password varchar(255) DEFAULT NULL,
+		ldap     tinyint      DEFAULT 0,
+		name     varchar(255) DEFAULT NULL,
+		roles    varchar(255) DEFAULT NULL,
+		email    varchar(255) DEFAULT NULL);`)
+	if err != nil {
+		return err
+	}
+
+	sessKey := os.Getenv("SESSION_KEY")
+	if sessKey == "" {
+		log.Println("warning: environment variable 'SESSION_KEY' not set (will use non-persistent random key)")
+		bytes := make([]byte, 32)
+		if _, err := rand.Read(bytes); err != nil {
+			return err
+		}
+		sessionStore = sessions.NewCookieStore(bytes)
+	} else {
+		bytes, err := base64.StdEncoding.DecodeString(sessKey)
+		if err != nil {
+			return err
+		}
+		sessionStore = sessions.NewCookieStore(bytes)
+	}
+
+	pubKey, privKey := os.Getenv("JWT_PUBLIC_KEY"), os.Getenv("JWT_PRIVATE_KEY")
+	if pubKey == "" || privKey == "" {
+		log.Println("warning: environment variables 'JWT_PUBLIC_KEY' or 'JWT_PRIVATE_KEY' not set (token based authentication will not work)")
+	} else {
+		bytes, err := base64.StdEncoding.DecodeString(pubKey)
+		if err != nil {
+			return err
+		}
+		JwtPublicKey = ed25519.PublicKey(bytes)
+		bytes, err = base64.StdEncoding.DecodeString(privKey)
+		if err != nil {
+			return err
+		}
+		JwtPrivateKey = ed25519.PrivateKey(bytes)
+	}
+
+	if ldapConfig != nil {
+		if err := initLdap(ldapConfig); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// arg must be formated like this: "<username>:[admin]:<password>"
+func AddUserToDB(db *sqlx.DB, arg string) error {
+	parts := strings.SplitN(arg, ":", 3)
+	if len(parts) != 3 || len(parts[0]) == 0 || len(parts[2]) == 0 || !(len(parts[1]) == 0 || parts[1] == "admin") {
+		return errors.New("invalid argument format")
+	}
+
+	password, err := bcrypt.GenerateFromPassword([]byte(parts[2]), bcrypt.DefaultCost)
+	if err != nil {
+		return err
+	}
+
+	roles := "[]"
+	if parts[1] == "admin" {
+		roles = "[\"ROLE_ADMIN\"]"
+	}
+
+	_, err = sq.Insert("user").Columns("username", "password", "roles").Values(parts[0], string(password), roles).RunWith(db).Exec()
+	if err != nil {
+		return err
+	}
+	log.Printf("new user '%s' added (roles: %s)\n", parts[0], roles)
+	return nil
+}
+
+func DelUserFromDB(db *sqlx.DB, username string) error {
+	_, err := db.Exec(`DELETE FROM user WHERE user.username = ?`, username)
+	return err
+}
+
+func fetchUserFromDB(db *sqlx.DB, username string) (*User, error) {
+	user := &User{Username: username}
+	var hashedPassword, name, rawRoles, email sql.NullString
+	if err := sq.Select("password", "ldap", "name", "roles", "email").From("user").
+		Where("user.username = ?", username).RunWith(db).
+		QueryRow().Scan(&hashedPassword, &user.ViaLdap, &name, &rawRoles, &email); err != nil {
+		return nil, fmt.Errorf("user '%s' not found (%s)", username, err.Error())
+	}
+
+	user.Password = hashedPassword.String
+	user.Name = name.String
+	user.Email = email.String
+	var roles []string
+	if rawRoles.Valid {
+		json.Unmarshal([]byte(rawRoles.String), &roles)
+	}
+	for _, role := range roles {
+		if role == "ROLE_ADMIN" {
+			user.IsAdmin = true
+		}
+	}
+
+	return user, nil
+}
+
+// Handle a POST request that should log the user in,
+// starting a new session.
+func Login(db *sqlx.DB) http.Handler {
+	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		username, password := r.FormValue("username"), r.FormValue("password")
+		user, err := fetchUserFromDB(db, username)
+		if err == nil && user.ViaLdap && ldapAuthEnabled {
+			err = loginViaLdap(user, password)
+		} else if err == nil && !user.ViaLdap && user.Password != "" {
+			if e := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)); e != nil {
+				err = fmt.Errorf("user '%s' provided the wrong password (%s)", username, e.Error())
+			}
+		} else {
+			err = errors.New("could not authenticate user")
+		}
+
+		if err != nil {
+			log.Printf("login failed: %s\n", err.Error())
+			rw.WriteHeader(http.StatusUnauthorized)
+			templates.Render(rw, r, "login.html", &templates.Page{
+				Title: "Login failed",
+				Login: &templates.LoginPage{
+					Error: "Username or password incorrect",
+				},
+			})
+			return
+		}
+
+		session, err := sessionStore.New(r, "session")
+		if err != nil {
+			log.Printf("session creation failed: %s\n", err.Error())
+			http.Error(rw, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		session.Values["username"] = user.Username
+		session.Values["is_admin"] = user.IsAdmin
+		if err := sessionStore.Save(r, rw, session); err != nil {
+			log.Printf("session save failed: %s\n", err.Error())
+			http.Error(rw, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		log.Printf("login successfull: user: %#v\n", user)
+		http.Redirect(rw, r, "/", http.StatusTemporaryRedirect)
+	})
+}
+
+var ErrTokenInvalid error = errors.New("invalid token")
+
+func authViaToken(r *http.Request) (*User, error) {
+	if JwtPublicKey == nil {
+		return nil, nil
+	}
+
+	rawtoken := r.Header.Get("X-Auth-Token")
+	if rawtoken == "" {
+		rawtoken = r.Header.Get("Authorization")
+		prefix := "Bearer "
+		if !strings.HasPrefix(rawtoken, prefix) {
+			return nil, nil
+		}
+		rawtoken = rawtoken[len(prefix):]
+	}
+
+	token, err := jwt.Parse(rawtoken, func(t *jwt.Token) (interface{}, error) {
+		if t.Method != jwt.SigningMethodEdDSA {
+			return nil, errors.New("only Ed25519/EdDSA supported")
+		}
+		return JwtPublicKey, nil
+	})
+	if err != nil {
+		return nil, ErrTokenInvalid
+	}
+
+	if err := token.Claims.Valid(); err != nil {
+		return nil, ErrTokenInvalid
+	}
+
+	claims := token.Claims.(jwt.MapClaims)
+	sub, _ := claims["sub"].(string)
+	isAdmin, _ := claims["is_admin"].(bool)
+	return &User{
+		Username: sub,
+		IsAdmin:  isAdmin,
+	}, nil
+}
+
+// Authenticate the user and put a User object in the
+// context of the request. If authentication fails,
+// do not continue but send client to the login screen.
+func Auth(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		user, err := authViaToken(r)
+		if err == ErrTokenInvalid {
+			log.Printf("authentication failed: invalid token\n")
+			http.Error(rw, err.Error(), http.StatusUnauthorized)
+			return
+		}
+		if user != nil {
+			ctx := context.WithValue(r.Context(), ContextUserKey, user)
+			next.ServeHTTP(rw, r.WithContext(ctx))
+			return
+		}
+
+		session, err := sessionStore.Get(r, "session")
+		if err != nil {
+			http.Error(rw, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		if session.IsNew {
+			log.Printf("authentication failed: no session or jwt found\n")
+
+			rw.WriteHeader(http.StatusUnauthorized)
+			templates.Render(rw, r, "login.html", &templates.Page{
+				Title: "Authentication failed",
+				Login: &templates.LoginPage{
+					Error: "No valid session or JWT provided",
+				},
+			})
+			return
+		}
+
+		ctx := context.WithValue(r.Context(), ContextUserKey, &User{
+			Username: session.Values["username"].(string),
+			IsAdmin:  session.Values["is_admin"].(bool),
+		})
+		next.ServeHTTP(rw, r.WithContext(ctx))
+	})
+}
+
+// Generate a new JWT that can be used for authentication
+func ProvideJWT(user *User) (string, error) {
+	if JwtPrivateKey == nil {
+		return "", errors.New("environment variable 'JWT_PUBLIC_KEY' not set")
+	}
+
+	tok := jwt.NewWithClaims(jwt.SigningMethodEdDSA, jwt.MapClaims{
+		"sub":      user.Username,
+		"is_admin": user.IsAdmin,
+	})
+
+	return tok.SignedString(JwtPrivateKey)
+}
+
+func GetUser(ctx context.Context) *User {
+	x := ctx.Value(ContextUserKey)
+	if x == nil {
+		return nil
+	}
+
+	return x.(*User)
+}
+
+// Clears the session cookie
+func Logout(rw http.ResponseWriter, r *http.Request) {
+	session, err := sessionStore.Get(r, "session")
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	if !session.IsNew {
+		session.Options.MaxAge = -1
+		if err := sessionStore.Save(r, rw, session); err != nil {
+			http.Error(rw, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	}
+
+	templates.Render(rw, r, "login.html", &templates.Page{
+		Title: "Logout successful",
+		Login: &templates.LoginPage{
+			Info: "Logout successful",
+		},
+	})
+}
diff --git a/auth/ldap.go b/auth/ldap.go
new file mode 100644
index 0000000..bb401bc
--- /dev/null
+++ b/auth/ldap.go
@@ -0,0 +1,183 @@
+package auth
+
+import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+	"sync"
+
+	"github.com/go-ldap/ldap/v3"
+	"github.com/jmoiron/sqlx"
+)
+
+type LdapConfig struct {
+	Url        string `json:"url"`
+	UserBase   string `json:"user_base"`
+	SearchDN   string `json:"search_dn"`
+	UserBind   string `json:"user_bind"`
+	UserFilter string `json:"user_filter"`
+	TLS        bool   `json:"tls"`
+}
+
+var ldapAuthEnabled bool = false
+var ldapConfig *LdapConfig
+var ldapAdminPassword string
+
+func initLdap(config *LdapConfig) error {
+	ldapAdminPassword = os.Getenv("LDAP_ADMIN_PASSWORD")
+	if ldapAdminPassword == "" {
+		log.Println("warning: environment variable 'LDAP_ADMIN_PASSWORD' not set")
+	}
+
+	ldapConfig = config
+	ldapAuthEnabled = true
+	return nil
+}
+
+var ldapConnectionsLock sync.Mutex
+var ldapConnections []*ldap.Conn = []*ldap.Conn{}
+
+// TODO: Add a connection pool or something like
+// that so that connections can be reused/cached.
+func getLdapConnection() (*ldap.Conn, error) {
+	ldapConnectionsLock.Lock()
+	n := len(ldapConnections)
+	if n > 0 {
+		conn := ldapConnections[n-1]
+		ldapConnections = ldapConnections[:n-1]
+		ldapConnectionsLock.Unlock()
+		return conn, nil
+	}
+	ldapConnectionsLock.Unlock()
+
+	conn, err := ldap.DialURL(ldapConfig.Url)
+	if err != nil {
+		return nil, err
+	}
+
+	if ldapConfig.TLS {
+		if err := conn.StartTLS(&tls.Config{InsecureSkipVerify: true}); err != nil {
+			conn.Close()
+			return nil, err
+		}
+	}
+
+	if err := conn.Bind(ldapConfig.SearchDN, ldapAdminPassword); err != nil {
+		conn.Close()
+		return nil, err
+	}
+
+	return conn, nil
+}
+
+func releaseConnection(conn *ldap.Conn) {
+	// Re-bind to the user we can run queries with
+	if err := conn.Bind(ldapConfig.SearchDN, ldapAdminPassword); err != nil {
+		conn.Close()
+		log.Printf("ldap error: %s", err.Error())
+	}
+
+	ldapConnectionsLock.Lock()
+	defer ldapConnectionsLock.Unlock()
+
+	n := len(ldapConnections)
+	if n > 2 {
+		conn.Close()
+		return
+	}
+
+	ldapConnections = append(ldapConnections, conn)
+}
+
+func loginViaLdap(user *User, password string) error {
+	l, err := getLdapConnection()
+	if err != nil {
+		return err
+	}
+	defer releaseConnection(l)
+
+	userDn := strings.Replace(ldapConfig.UserBind, "{username}", user.Username, -1)
+	if err := l.Bind(userDn, password); err != nil {
+		return err
+	}
+
+	user.ViaLdap = true
+	return nil
+}
+
+// Delete users where user.ldap is 1 and that do not show up in the ldap search results.
+// Add users to the users table that are new in the ldap search results.
+func SyncWithLDAP(db *sqlx.DB) error {
+	if !ldapAuthEnabled {
+		return errors.New("ldap not enabled")
+	}
+
+	const IN_DB int = 1
+	const IN_LDAP int = 2
+	const IN_BOTH int = 3
+
+	users := map[string]int{}
+	rows, err := db.Query(`SELECT username FROM user WHERE user.ldap = 1`)
+	if err != nil {
+		return err
+	}
+
+	for rows.Next() {
+		var username string
+		if err := rows.Scan(&username); err != nil {
+			return err
+		}
+
+		users[username] = IN_DB
+	}
+
+	l, err := getLdapConnection()
+	if err != nil {
+		return err
+	}
+	defer releaseConnection(l)
+
+	ldapResults, err := l.Search(ldap.NewSearchRequest(
+		ldapConfig.UserBase, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
+		ldapConfig.UserFilter, []string{"dn", "uid", "gecos"}, nil))
+	if err != nil {
+		return err
+	}
+
+	newnames := map[string]string{}
+	for _, entry := range ldapResults.Entries {
+		username := entry.GetAttributeValue("uid")
+		if username == "" {
+			return errors.New("no attribute 'uid'")
+		}
+
+		_, ok := users[username]
+		if !ok {
+			users[username] = IN_LDAP
+			newnames[username] = entry.GetAttributeValue("gecos")
+		} else {
+			users[username] = IN_BOTH
+		}
+	}
+
+	for username, where := range users {
+		if where == IN_DB {
+			fmt.Printf("ldap-sync: remove '%s' (does not show up in LDAP anymore)\n", username)
+			if _, err := db.Exec(`DELETE FROM user WHERE user.username = ?`, username); err != nil {
+				return err
+			}
+		} else if where == IN_LDAP {
+			name := newnames[username]
+			fmt.Printf("ldap-sync: add '%s' (name: '%s', roles: [], ldap: true)\n", username, name)
+			if _, err := db.Exec(`INSERT INTO user (username, ldap, name, roles) VALUES (?, ?, ?, ?)`,
+				username, 1, name, "[]"); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}