diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Client.java b/src/be/jeffcheasey88/peeratcode/webserver/Client.java
index c882f41..2f5bfa2 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Client.java
+++ b/src/be/jeffcheasey88/peeratcode/webserver/Client.java
@@ -43,8 +43,7 @@ public class Client extends Thread{
 		            .setRequireExpirationTime()
 		            .setAllowedClockSkewInSeconds(30)
 		            .setRequireSubject()
-		            .setExpectedIssuer("Issuer")
-		            .setExpectedAudience("Audience")
+		            .setExpectedIssuer(this.router.getTokenIssuer())
 		            .setVerificationKey(this.router.getWebKey().getKey())
 		            .setJwsAlgorithmConstraints(
 		                    ConstraintType.PERMIT, AlgorithmIdentifiers.RSA_USING_SHA256)
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Router.java b/src/be/jeffcheasey88/peeratcode/webserver/Router.java
index a5dcc1c..f166ffe 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Router.java
+++ b/src/be/jeffcheasey88/peeratcode/webserver/Router.java
@@ -57,6 +57,10 @@ public class Router{
 		return this.rsaJsonWebKey;
 	}
 	
+	public String getTokenIssuer(){
+		return this.token_issuer;
+	}
+	
 	public String createAuthUser(int id) throws JoseException{
 		JwtClaims claims = new JwtClaims();
 	    claims.setIssuer(token_issuer);  // who creates the token and signs it