diff --git a/includes/openid-connect-generic-client-wrapper.php b/includes/openid-connect-generic-client-wrapper.php
index ebcb3c1..a976b07 100644
--- a/includes/openid-connect-generic-client-wrapper.php
+++ b/includes/openid-connect-generic-client-wrapper.php
@@ -137,6 +137,12 @@ class OpenID_Connect_Generic_Client_Wrapper {
 		}
 
 		$token_result = $this->client->request_new_tokens( $refresh_token );
+		
+		if ( is_wp_error( $token_result ) ) {
+			wp_logout();
+			$this->error_redirect( $token_result );
+		}
+
 		$token_response = $this->client->get_token_response( $token_result );
 
 		if ( is_wp_error( $token_response ) ) {
diff --git a/openid-connect-generic.php b/openid-connect-generic.php
index e654b4e..3b6383b 100644
--- a/openid-connect-generic.php
+++ b/openid-connect-generic.php
@@ -152,8 +152,9 @@ class OpenID_Connect_Generic {
 	static public function autoload( $class ) {
 		$filename = $class . '.php';
 
-		if ( false === strpos( $class, '\\' ) ) {
-			$filename = strtolower( str_replace( '_', '-', $class ) ) . '.php';
+		// internal files are all lowercase and use dashes in filenames
+		if ( false === strpos( $filename, '\\' ) ) {
+			$filename = strtolower( str_replace( '_', '-', $filename ) );
 		}
 		else {
 			$filename  = str_replace('\\', DIRECTORY_SEPARATOR, $filename);
@@ -193,6 +194,8 @@ class OpenID_Connect_Generic {
 				
 				// plugin settings
 				'enforce_privacy' => 0,
+				'link_existing_users' => 0,
+				'redirect_user_back' => 0,
 				'enable_logging'  => 0,
 				'log_limit'       => 1000, 
 			)