diff --git a/server/main.go b/server/main.go
index 590f67dbdb7d4b67ab73d21b17127d93e18ee4f2..c5865deb1f5912eb60abaed387d96f59966073cd 100644
--- a/server/main.go
+++ b/server/main.go
@@ -122,7 +122,7 @@ func signHandler(a *appContext, w http.ResponseWriter, r *http.Request) (int, er
 
 // loginHandler starts the authentication process with the provider.
 func loginHandler(a *appContext, w http.ResponseWriter, r *http.Request) (int, error) {
-	a.authsession = a.authprovider.StartSession(newState(32))
+	a.authsession = a.authprovider.StartSession(newState())
 	http.Redirect(w, r, a.authsession.AuthURL, http.StatusFound)
 	return http.StatusFound, nil
 }
@@ -203,7 +203,7 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	authprovider := google.New(config.Auth)
+	authprovider := google.New(&config.Auth)
 	ctx := &appContext{
 		cookiestore:   sessions.NewCookieStore([]byte(config.Server.CookieSecret)),
 		authprovider:  authprovider,
diff --git a/server/signer/signer_test.go b/server/signer/signer_test.go
index 6feeaa57df47705707412dfb7c2189c490c2c8c3..08f9025565ceeda4c85860d78bfcb755e1d4a1c2 100644
--- a/server/signer/signer_test.go
+++ b/server/signer/signer_test.go
@@ -27,7 +27,7 @@ func TestCert(t *testing.T) {
 		Principal:  "gopher1",
 		ValidUntil: time.Now().Add(1 * time.Hour),
 	}
-	ret, err := signer.Sign(r)
+	ret, err := signer.SignUserKey(r)
 	if err != nil {
 		t.Fatal(err)
 	}