diff --git a/login-github.php b/login-github.php
index 4dd89bf..51bcdd1 100644
--- a/login-github.php
+++ b/login-github.php
@@ -9,11 +9,13 @@
 define('CLIENT_ENABLED', get_option('wpoa_github_api_enabled'));
 define('CLIENT_ID', get_option('wpoa_github_api_id'));
 define('CLIENT_SECRET', get_option('wpoa_github_api_secret'));
+define('RESTRICT_ORGANISATION', get_option('wpoa_github_api_organisation'));
 define('REDIRECT_URI', rtrim(site_url(), '/') . '/');
-define('SCOPE', 'user'); // PROVIDER SPECIFIC: "user" is the minimum scope required to get the user's id from Github
+define('SCOPE', ''); // PROVIDER SPECIFIC: Empty string gives us everything we need and is read only.
 define('URL_AUTH', "https://github.com/login/oauth/authorize?");
 define('URL_TOKEN', "https://github.com/login/oauth/access_token?");
 define('URL_USER', "https://api.github.com/user?");
+define('URL_ORGANISATION', "https://api.github.com/orgs/".RESTRICT_ORGANISATION."/members?");
 # END OF DEFINE THE OAUTH PROVIDER AND SETTINGS TO USE #
 
 // remember the user's last url so we can redirect them back to there after the login ends:
@@ -142,6 +144,7 @@ function get_oauth_identity($wpoa) {
 		'access_token' => $_SESSION['WPOA']['ACCESS_TOKEN'], // PROVIDER SPECIFIC: the access token is passed to Github using this key name
 	);
 	$url_params = http_build_query($params);
+
 	// perform the http request:
 	switch (strtolower(HTTP_UTIL)) {
 		case 'curl':
@@ -154,6 +157,18 @@ function get_oauth_identity($wpoa) {
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 			$result = curl_exec($curl);
 			$result_obj = json_decode($result, true);
+
+			// Find organisation members
+			if(strlen(RESTRICT_ORGANISATION) > 0){
+				$m_url = URL_ORGANISATION . $url_params; // TODO: we probably want to send this using a curl_setopt...
+				$m_curl = curl_init();
+				curl_setopt($m_curl, CURLOPT_URL, $m_url);
+				curl_setopt($m_curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+				curl_setopt($m_curl, CURLOPT_RETURNTRANSFER, 1);
+				$members = curl_exec($m_curl);
+				$members_obj = json_decode($members, true);
+			}
+
 			break;
 		case 'stream-context':
 			$url = rtrim(URL_USER, "?");
@@ -164,23 +179,61 @@ function get_oauth_identity($wpoa) {
 					'header'  => "Authorization: token " . $_SESSION['WPOA']['ACCESS_TOKEN'],
 				)
 			);
-			$context = $context  = stream_context_create($opts);
+			$context  = stream_context_create($opts);
 			$result = @file_get_contents($url, false, $context);
 			if ($result === false) {
 				$wpoa->wpoa_end_login("Sorry, we couldn't log you in. Could not retrieve user identity via stream context. Please notify the admin or try again later.");
 			}
 			$result_obj = json_decode($result, true);
+
+			// Find organisation members
+			if(strlen(RESTRICT_ORGANISATION) > 0){
+				$m_url = rtrim(URL_ORGANISATION, "?");
+				$members = @file_get_contents($m_url, false, $context);
+				if ($members === false) {
+					$wpoa->wpoa_end_login("Sorry, we couldn't find the GitHub organisation members list. Please notify the admin or try again later.");
+				}
+				$members_obj = json_decode($result, true);
+			}
+
 			break;
 	}
+
+	// GitHub organisation membership check
+	if(strlen(RESTRICT_ORGANISATION) > 0){
+		$has_membership = false;
+		foreach($members_obj as $member){
+			if(isset($member['id']) && $member['id'] == $result_obj['id']){
+				$has_membership = true;
+			}
+		}
+		if(!$has_membership){
+			$wpoa->wpoa_end_login("Sorry, you need to be a member of the <a href='https://github.com/".RESTRICT_ORGANISATION."' target='_blank'>".RESTRICT_ORGANISATION."</a> GitHub organisation to log into this site.");
+		}
+	}
+
+	// Check that we have the user ID
+	if(!isset($result_obj['id']) or strlen($result_obj['id']) == 0){
+		$wpoa->wpoa_end_login("Error - could not find the user ID from GitHub.");
+	}
+
 	// parse and return the user's oauth identity:
 	$oauth_identity = array();
 	$oauth_identity['provider'] = $_SESSION['WPOA']['PROVIDER'];
 	$oauth_identity['id'] = $result_obj['id']; // PROVIDER SPECIFIC: this is how Github returns the user's unique id
 	//$oauth_identity['email'] = $result_obj['email']; //PROVIDER SPECIFIC: this is how Github returns the email address
+
+	// Bonus data from GitHub
+	$oauth_identity['oa_login'] = $result_obj['login'];
+	$oauth_identity['oa_email'] = $result_obj['email'];
+	$oauth_identity['oa_nicename'] = $result_obj['name'];
+	$oauth_identity['oa_desc'] = $result_obj['bio'];
+	$oauth_identity['oa_url'] = $result_obj['blog'];
+
 	if (!$oauth_identity['id']) {
 		$wpoa->wpoa_end_login("Sorry, we couldn't log you in. User identity was not found. Please notify the admin or try again later.");
 	}
 	return $oauth_identity;
 }
 # END OF AUTHENTICATION FLOW HELPER FUNCTIONS #
-?>
\ No newline at end of file
+?>
diff --git a/register.php b/register.php
index d3a93a8..0c6ad70 100644
--- a/register.php
+++ b/register.php
@@ -1 +1,110 @@
-<?php

// TODO: very important that we sanitize all $_POST variables here before using them!
// TODO: this doesn't call wpoa_end_login() which might result in the LAST_URL not being cleared...

global $wpdb;

// initiate the user session:
session_start();

// prevent users from registering if the option is turned off in the dashboard:
if (!get_option("users_can_register")) {
	$_SESSION["WPOA"]["RESULT"] = "Sorry, user registration is disabled at this time. Your account could not be registered. Please notify the admin or try again later.";
	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]);
	exit;
}

// registration was initiated from an oauth provider, set the username and password automatically.
if ($_SESSION["WPOA"]["USER_ID"] != "") {
	$username = uniqid('', true);
	$password = wp_generate_password();
}

// registration was initiated from the standard sign up form, set the username and password that was requested by the user.
if ( $_SESSION["WPOA"]["USER_ID"] == "" ) {
	// this registration was initiated from the standard Registration page, create account and login the user automatically
	$username = $_POST['identity'];
	$password = $_POST['password'];
}

// now attempt to generate the user and get the user id:
$user_id = wp_create_user( $username, $password, $username ); // we use wp_create_user instead of wp_insert_user so we can handle the error when the user being registered already exists

// check if the user was actually created:
if (is_wp_error($user_id)) {
	// there was an error during registration, redirect and notify the user:
	$_SESSION["WPOA"]["RESULT"] = $user_id->get_error_message();
	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]);
	exit;
}

// now try to update the username to something more permanent and recognizable:
$username = "user" . $user_id;
$update_username_result = $wpdb->update($wpdb->users, array('user_login' => $username, 'user_nicename' => $username, 'display_name' => $username), array('ID' => $user_id));
$update_nickname_result = update_user_meta($user_id, 'nickname', $username);

// apply the custom default user role:
$role = get_option('wpoa_new_user_role');
$update_role_result = wp_update_user(array('ID' => $user_id, 'role' => $role));

// proceed if no errors were detected:
if ($update_username_result == false || $update_nickname_result == false) {
	// there was an error during registration, redirect and notify the user:
	$_SESSION["WPOA"]["RESULT"] = "Could not rename the username during registration. Please contact an admin or try again later.";
	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]); exit;
}
elseif ($update_role_result == false) {
	// there was an error during registration, redirect and notify the user:
	$_SESSION["WPOA"]["RESULT"] = "Could not assign default user role during registration. Please contact an admin or try again later.";
	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]); exit;
}
else {
	// registration was successful, the user account was created, proceed to login the user automatically...
	// associate the wordpress user account with the now-authenticated third party account:
	$this->wpoa_link_account($user_id);
	// attempt to login the new user (this could be error prone):
	$creds = array();
	$creds['user_login'] = $username;
	$creds['user_password'] = $password;
	$creds['remember'] = true;
	$user = wp_signon( $creds, false );
	// send a notification e-mail to the admin and the new user (we can also build our own email if necessary):
	if (!get_option('wpoa_suppress_welcome_email')) {
		//wp_mail($username, "New User Registration", "Thank you for registering!\r\nYour username: " . $username . "\r\nYour password: " . $password, $headers);
		wp_new_user_notification( $user_id, $password );
	}
	// finally redirect the user back to the page they were on and notify them of successful registration:
	$_SESSION["WPOA"]["RESULT"] = "You have been registered successfully!";
	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]); exit;
}
?>
\ No newline at end of file
+<?php
+
+// TODO: very important that we sanitize all $_POST variables here before using them!
+// TODO: this doesn't call wpoa_end_login() which might result in the LAST_URL not being cleared...
+
+global $wpdb;
+
+// initiate the user session:
+session_start();
+
+// prevent users from registering if the option is turned off in the dashboard:
+if (!get_option("users_can_register")) {
+	$_SESSION["WPOA"]["RESULT"] = "Sorry, user registration is disabled at this time. Your account could not be registered. Please notify the admin or try again later.";
+	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]);
+	exit;
+}
+
+// registration was initiated from an oauth provider, set the username and password automatically.
+if ($_SESSION["WPOA"]["USER_ID"] != "") {
+
+	// Try to use same username as the provider
+	if(isset($_SESSION['WPOA']['OA_USERNAME']) && strlen($_SESSION['WPOA']['OA_USERNAME']) > 0){
+		$username = $_SESSION['WPOA']['OA_USERNAME'];
+	} else {
+		$username = uniqid('', true);
+	}
+	$password = wp_generate_password();
+}
+
+// registration was initiated from the standard sign up form, set the username and password that was requested by the user.
+if ( $_SESSION["WPOA"]["USER_ID"] == "" ) {
+	// this registration was initiated from the standard Registration page, create account and login the user automatically
+	$username = $_POST['identity'];
+	$password = $_POST['password'];
+}
+
+// Try to register with the OA e-mail address if we have it
+// NB: Not a security risk. This e-mail address can't be used to log in.
+if(isset($_SESSION['WPOA']['OA_EMAIL']) && strlen($_SESSION['WPOA']['OA_EMAIL']) > 0){
+	$email = $_SESSION['WPOA']['OA_EMAIL'];
+} else {
+	$email = $username; // not sure why we do this, but was previous behaviour so leaving it here.
+}
+
+// now attempt to generate the user and get the user id:
+$user_id = wp_create_user( $username, $password, $email ); // we use wp_create_user instead of wp_insert_user so we can handle the error when the user being registered already exists
+
+// check if the user was actually created:
+if (is_wp_error($user_id)) {
+	// there was an error during registration, redirect and notify the user:
+	$_SESSION["WPOA"]["RESULT"] = $user_id->get_error_message();
+	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]);
+	exit;
+}
+
+// now try to update the username to something more permanent and recognizable:
+if(isset($_SESSION['WPOA']['OA_NICENAME']) && strlen($_SESSION['WPOA']['OA_NICENAME']) > 0){
+	$nicename = $_SESSION['WPOA']['OA_NICENAME'];
+} else {
+	$nicename = $username;
+}
+$update_username_result = $wpdb->update($wpdb->users, array('user_login' => $username, 'user_nicename' => $nicename, 'display_name' => $nicename), array('ID' => $user_id));
+$update_nickname_result = update_user_meta($user_id, 'nickname', $nicename);
+
+// Update new user with other OA metadata if we have it
+if(isset($_SESSION['WPOA']['GH_BIO']) && strlen($_SESSION['WPOA']['OA_DESC']) > 0){
+	update_user_meta( $user_id, 'description', $_SESSION['WPOA']['OA_DESC']);
+}
+if(isset($_SESSION['WPOA']['OA_URL']) && strlen($_SESSION['WPOA']['OA_URL']) > 0){
+	$update_username_result = $wpdb->update($wpdb->users, array('user_url' => $_SESSION['WPOA']['OA_URL']), array('ID' => $user_id));
+}
+
+
+
+
+// apply the custom default user role:
+$role = get_option('wpoa_new_user_role');
+$update_role_result = wp_update_user(array('ID' => $user_id, 'role' => $role));
+
+// proceed if no errors were detected:
+if ($update_username_result == false || $update_nickname_result == false) {
+	// there was an error during registration, redirect and notify the user:
+	$_SESSION["WPOA"]["RESULT"] = "Could not rename the username during registration. Please contact an admin or try again later.";
+	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]); exit;
+}
+elseif ($update_role_result == false) {
+	// there was an error during registration, redirect and notify the user:
+	$_SESSION["WPOA"]["RESULT"] = "Could not assign default user role during registration. Please contact an admin or try again later.";
+	header("Location: " . $_SESSION["WPOA"]["LAST_URL"]); exit;
+}
+else {
+	// registration was successful, the user account was created, proceed to login the user automatically...
+	// associate the wordpress user account with the now-authenticated third party account:
+	$this->wpoa_link_account($user_id);
+	// attempt to login the new user (this could be error prone):
+	$creds = array();
+	$creds['user_login'] = $username;
+	$creds['user_password'] = $password;
+	$creds['remember'] = true;
+	$user = wp_signon( $creds, false );
+	// send a notification e-mail to the admin and the new user (we can also build our own email if necessary):
+	if (!get_option('wpoa_suppress_welcome_email')) {
+		//wp_mail($username, "New User Registration", "Thank you for registering!\r\nYour username: " . $username . "\r\nYour password: " . $password, $headers);
+		wp_new_user_notification( $user_id, $password );
+	}
+	// finally redirect the user back to the page they were on and notify them of successful registration:
+	$_SESSION["WPOA"]["RESULT"] = "You have been registered successfully!";
+	$this->wpoa_end_login("You have been registered successfully!");
+}
+?>
diff --git a/wp-oauth-settings.php b/wp-oauth-settings.php
index de1c3ab..d1dde93 100644
--- a/wp-oauth-settings.php
+++ b/wp-oauth-settings.php
@@ -20,7 +20,7 @@ function wpoa_cc_security() {
 		$points_max = 6;
 		return floor(($points / $points_max) * 100);
 	}
-	
+
 	// config check privacy
 	function wpoa_cc_privacy() {
 		$points = 0;
@@ -31,7 +31,7 @@ function wpoa_cc_privacy() {
 		$points_max = 1;
 		return floor(($points / $points_max) * 100);
 	}
-	
+
 	// config check user experience
 	function wpoa_cc_ux() {
 		$points = 0;
@@ -44,7 +44,7 @@ function wpoa_cc_ux() {
 		$points_max = 2;
 		return floor(($points / $points_max) * 100);
 	}
-	
+
 	// cache the config check ratings:
 	$cc_security = wpoa_cc_security();
 	$cc_privacy = wpoa_cc_privacy();
@@ -75,10 +75,10 @@ function wpoa_cc_ux() {
 		<div id="wpoa-settings-section-news" class="wpoa-settings-section">
 			<h3>News</h3>
 			<div class='form-padding'>
-				<?php 
+				<?php
 				$rss = fetch_feed("http://glassocean.net/tag/wp-oauth/feed/");
 				if (!is_wp_error($rss)) {
-					$maxitems = $rss->get_item_quantity(5); 
+					$maxitems = $rss->get_item_quantity(5);
 					$rss_items = $rss->get_items(0, $maxitems);
 				}
 				?>
@@ -183,7 +183,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Shows a short-lived notification message to the user which indicates whether or not the login was successful, and if there was an error.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Login redirects to: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -200,7 +200,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Specifies where to redirect a user after they log in.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logout redirects to: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -218,7 +218,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Specifies where to redirect a user after they log out.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Automatically logout inactive users: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -241,19 +241,19 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END General Settings section -->
-			
+
 			<!-- START Login Page & Form Customization section -->
 			<div id="wpoa-settings-section-login-forms" class="wpoa-settings-section">
 			<h3>Login Forms</h3>
 			<div class='form-padding'>
 			<table class='form-table'>
-				
+
 				<tr valign='top'>
 				<th colspan="2">
 					<h4>Default Login Form / Page / Popup</h4>
 				</th>
 				</td>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Hide the WordPress login form: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -262,7 +262,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message tip-warning"><strong>Warning: </strong>Hiding the WordPress login form may prevent you from being able to login. If you normally rely on this method, DO NOT enable this setting. Furthermore, please make sure your login provider(s) are active and working BEFORE enabling this setting.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logo links to site: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -270,7 +270,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Forces the logo image on the login form to link to your site instead of WordPress.org.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logo image: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -281,7 +281,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Changes the default WordPress logo on the login form to an image of your choice. You may select an image from the Media Library, or specify a custom URL.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Background image: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -292,13 +292,13 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Changes the background on the login form to an image of your choice. You may select an image from the Media Library, or specify a custom URL.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th colspan="2">
 					<h4>Custom Login Forms</h4>
 				</th>
 				</td>
-			
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Custom form to show on the login screen: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -306,7 +306,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Create or manage these login form designs in the CUSTOM LOGIN FORM DESIGNS section.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Custom form to show on the user's profile page: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -314,7 +314,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Create or manage these login form designs in the CUSTOM LOGIN FORM DESIGNS section.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Custom form to show in the comments section: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -348,14 +348,14 @@ function wpoa_cc_ux() {
 				</td>
 				</tr>
 			</table> <!-- .form-table -->
-			
+
 			<table class="form-table" id="wpoa-login-form-design-form">
 				<tr valign='top'>
 				<th colspan="2">
 					<h4>Edit Design</h4>
 				</th>
 				</td>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Design name: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -363,7 +363,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the name to use for this design.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Icon set: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -374,7 +374,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Specifies which icon set to use for displaying provider icons on the login buttons.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Show login buttons: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -386,7 +386,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Determines when the login buttons should be shown.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Show logout button: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -398,7 +398,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Determines when the logout button should be shown.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Layout: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -411,7 +411,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets vertical or horizontal layout for the buttons.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Login button prefix: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -419,7 +419,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the text prefix to be displayed on the social login buttons.</p>
 				</td>
 				</tr>
-			
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logged out title: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -427,7 +427,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the text to be displayed above the login form for logged out users.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logged in title: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -435,7 +435,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the text to be displayed above the login form for logged in users.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logging in title: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -443,7 +443,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the text to be displayed above the login form for users who are logging in.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Logging out title: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -451,14 +451,14 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Sets the text to be displayed above the login form for users who are logging out.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' id='wpoa-login-form-actions'>
 				<th scope='row'>
 					<input type="button" id="wpoa-login-form-ok" name="wpoa_login_form_ok" class="button" value="OK">
 					<input type="button" id="wpoa-login-form-cancel" name="wpoa_login_form_cancel" class="button" value="Cancel">
 				</th>
 				<td>
-					
+
 				</td>
 				</tr>
 			</table> <!-- .form-table -->
@@ -466,7 +466,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login Buttons section -->
-			
+
 			<!-- START User Registration section -->
 			<div id="wpoa-settings-section-user-registration" class="wpoa-settings-section">
 			<h3>User Registration</h3>
@@ -479,7 +479,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">Prevents WordPress from sending an email to newly registered users by default, which contains their username and password.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Assign new users to the following role: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -492,7 +492,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END User Registration section -->
-			
+
 			<!-- START Login with Google section -->
 			<div id="wpoa-settings-section-login-with-google" class="wpoa-settings-section">
 			<h3>Login with Google</h3>
@@ -504,7 +504,7 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_google_api_enabled' value='1' <?php checked(get_option('wpoa_google_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
@@ -533,7 +533,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with Google section -->
-			
+
 			<!-- START Login with Facebook section -->
 			<div id="wpoa-settings-section-login-with-facebook" class="wpoa-settings-section">
 			<h3>Login with Facebook</h3>
@@ -545,14 +545,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_facebook_api_enabled' value='1' <?php checked(get_option('wpoa_facebook_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>App ID:</th>
 				<td>
 					<input type='text' name='wpoa_facebook_api_id' value='<?php echo get_option('wpoa_facebook_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>App Secret:</th>
 				<td>
@@ -573,7 +573,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with Facebook section -->
-			
+
 			<!-- START Login with LinkedIn section -->
 			<div id="wpoa-settings-section-login-with-linkedin" class="wpoa-settings-section">
 			<h3>Login with LinkedIn</h3>
@@ -585,14 +585,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_linkedin_api_enabled' value='1' <?php checked(get_option('wpoa_linkedin_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>API Key:</th>
 				<td>
 					<input type='text' name='wpoa_linkedin_api_id' value='<?php echo get_option('wpoa_linkedin_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Secret Key:</th>
 				<td>
@@ -613,7 +613,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with LinkedIn section -->
-			
+
 			<!-- START Login with Github section -->
 			<div id="wpoa-settings-section-login-with-github" class="wpoa-settings-section">
 			<h3>Login with Github</h3>
@@ -625,20 +625,27 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_github_api_enabled' value='1' <?php checked(get_option('wpoa_github_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
 					<input type='text' name='wpoa_github_api_id' value='<?php echo get_option('wpoa_github_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Client Secret:</th>
 				<td>
 					<input type='text' name='wpoa_github_api_secret' value='<?php echo get_option('wpoa_github_api_secret'); ?>' />
 				</td>
 				</tr>
+
+				<tr valign='top'>
+				<th scope='row'>Restrict to Organisation: (optional)</th>
+				<td>
+					<input type='text' name='wpoa_github_api_organisation' value='<?php echo get_option('wpoa_github_api_organisation'); ?>' />
+				</td>
+				</tr>
 			</table> <!-- .form-table -->
 			<p>
 				<strong>Instructions:</strong>
@@ -653,7 +660,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with Github section -->
-			
+
 			<!-- START Login with Reddit section -->
 			<div id="wpoa-settings-section-login-with-reddit" class="wpoa-settings-section">
 			<h3>Login with Reddit</h3>
@@ -665,14 +672,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_reddit_api_enabled' value='1' <?php checked(get_option('wpoa_reddit_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
 					<input type='text' name='wpoa_reddit_api_id' value='<?php echo get_option('wpoa_reddit_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Client Secret:</th>
 				<td>
@@ -693,7 +700,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with Reddit section -->
-			
+
 			<!-- START Login with Windows Live section -->
 			<div id="wpoa-settings-section-login-with-windowslive" class="wpoa-settings-section">
 			<h3>Login with Windows Live</h3>
@@ -705,14 +712,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_windowslive_api_enabled' value='1' <?php checked(get_option('wpoa_windowslive_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
 					<input type='text' name='wpoa_windowslive_api_id' value='<?php echo get_option('wpoa_windowslive_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Client Secret:</th>
 				<td>
@@ -745,7 +752,7 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_paypal_api_enabled' value='1' <?php checked(get_option('wpoa_paypal_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Sandbox mode:</th>
 				<td>
@@ -753,14 +760,14 @@ function wpoa_cc_ux() {
 					<p class="tip-message">PayPal offers a sandbox mode for developers who wish to setup and test PayPal Login with their site before going live.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
 					<input type='text' name='wpoa_paypal_api_id' value='<?php echo get_option('wpoa_paypal_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Client Secret:</th>
 				<td>
@@ -795,14 +802,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_instagram_api_enabled' value='1' <?php checked(get_option('wpoa_instagram_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Client ID:</th>
 				<td>
 					<input type='text' name='wpoa_instagram_api_id' value='<?php echo get_option('wpoa_instagram_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Client Secret:</th>
 				<td>
@@ -841,14 +848,14 @@ function wpoa_cc_ux() {
 					<input type='checkbox' name='wpoa_battlenet_api_enabled' value='1' <?php checked(get_option('wpoa_battlenet_api_enabled') == 1); ?> />
 				</td>
 				</tr>
-				
+
 				<tr valign='top'>
 				<th scope='row'>Key:</th>
 				<td>
 					<input type='text' name='wpoa_battlenet_api_id' value='<?php echo get_option('wpoa_battlenet_api_id'); ?>' />
 				</td>
 				</tr>
-				 
+
 				<tr valign='top'>
 				<th scope='row'>Secret:</th>
 				<td>
@@ -856,7 +863,7 @@ function wpoa_cc_ux() {
 				</td>
 				</tr>
 			</table> <!-- .form-table -->
-			
+
 			<p>
 				<strong>Instructions:</strong>
 				<ol>
@@ -877,7 +884,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Login with Battle.net section -->
-			
+
 			<!-- START Back Channel Configuration section -->
 			<div id="wpoa-settings-section-back-channel=configuration" class="wpoa-settings-section">
 			<h3>Back Channel Configuration</h3>
@@ -894,7 +901,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message">The method used by the web server for performing HTTP requests to the third-party providers. Most servers support cURL, but some servers may require Stream Context instead.</p>
 				</td>
 				</tr>
-				
+
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Verify Peer/Host SSL Certificates: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -908,7 +915,7 @@ function wpoa_cc_ux() {
 			</div> <!-- .form-padding -->
 			</div> <!-- .wpoa-settings-section -->
 			<!-- END Back Channel Configuration section -->
-			
+
 			<!-- START Maintenance & Troubleshooting section -->
 			<div id="wpoa-settings-section-maintenance-troubleshooting" class="wpoa-settings-section">
 			<h3>Maintenance & Troubleshooting</h3>
@@ -921,7 +928,7 @@ function wpoa_cc_ux() {
 					<p class="tip-message"><strong>Instructions:</strong> Check the box above, click the Save all settings button, and the settings will be restored to default.</p>
 					<p class="tip-message tip-warning"><strong>Warning:</strong> This will restore the default settings, erasing any API keys/secrets that you may have entered above.</p>
 				</td>
-				</tr>		
+				</tr>
 				<tr valign='top' class="has-tip">
 				<th scope='row'>Delete settings on uninstall: <a href="#" class="tip-button">[?]</a></th>
 				<td>
@@ -940,4 +947,4 @@ function wpoa_cc_ux() {
 	<!-- END Settings Column 1 -->
 	</div> <!-- #wpoa-settings-body -->
 	<!-- END Settings Body -->
-</div> <!-- .wrap .wpoa-settings -->
\ No newline at end of file
+</div> <!-- .wrap .wpoa-settings -->
diff --git a/wp-oauth.php b/wp-oauth.php
index 6f22ee4..596778a 100644
--- a/wp-oauth.php
+++ b/wp-oauth.php
@@ -22,7 +22,7 @@
 
 	// set a version that we can use for performing plugin updates, this should always match the plugin version:
 	const PLUGIN_VERSION = "0.4";
-	
+
 	// singleton class pattern:
 	protected static $instance = NULL;
 	public static function get_instance() {
@@ -91,6 +91,7 @@ public static function get_instance() {
 		'wpoa_github_api_enabled' => 0,									// 0, 1
 		'wpoa_github_api_id' => '',										// any string
 		'wpoa_github_api_secret' => '',									// any string
+		'wpoa_github_api_organisation' => '',							// any string
 		'wpoa_reddit_api_enabled' => 0,									// 0, 1
 		'wpoa_reddit_api_id' => '',										// any string
 		'wpoa_reddit_api_secret' => '',									// any string
@@ -112,7 +113,7 @@ public static function get_instance() {
 		'wpoa_restore_default_settings' => 0,							// 0, 1
 		'wpoa_delete_settings_on_uninstall' => 0,						// 0, 1
 	);
-	
+
 	// when the plugin class gets created, fire the initialization:
 	function __construct() {
 		// hook activation and deactivation for the plugin:
@@ -123,7 +124,7 @@ function __construct() {
 		// hook init event to handle plugin initialization:
 		add_action('init', array($this, 'init'));
 	}
-	
+
 	// a wrapper for wordpress' get_option(), this basically feeds get_option() the setting's correct default value as specified at the top of this file:
 	/*
 	function wpoa_option($name) {
@@ -132,15 +133,15 @@ function wpoa_option($name) {
 		return $val;
 	}
 	*/
-	
+
 	// do something during plugin activation:
 	function wpoa_activate() {
 	}
-	
+
 	// do something during plugin deactivation:
 	function wpoa_deactivate() {
 	}
-	
+
 	// do something during plugin update:
 	function wpoa_update() {
 		$plugin_version = WPOA::PLUGIN_VERSION;
@@ -155,7 +156,7 @@ function wpoa_update() {
 			add_action('admin_notices', array($this, 'wpoa_update_notice'));
 		}
 	}
-	
+
 	// indicate to the admin that the plugin has been updated:
 	function wpoa_update_notice() {
 		$settings_link = "<a href='options-general.php?page=WP-OAuth.php'>Settings Page</a>"; // CASE SeNsItIvE filename!
@@ -165,7 +166,7 @@ function wpoa_update_notice() {
 		</div>
 		<?php
 	}
-	
+
 	// adds any missing settings and their default values:
 	function wpoa_add_missing_settings() {
 		foreach($this->settings as $setting_name => $default_value) {
@@ -176,7 +177,7 @@ function wpoa_add_missing_settings() {
 			$added = add_option($setting_name, $default_value);
 		}
 	}
-	
+
 	// restores the default plugin settings:
 	function wpoa_restore_default_settings() {
 		foreach($this->settings as $setting_name => $default_value) {
@@ -188,7 +189,7 @@ function wpoa_restore_default_settings() {
 		}
 		add_action('admin_notices', array($this, 'wpoa_restore_default_settings_notice'));
 	}
-	
+
 	// indicate to the admin that the plugin has been updated:
 	function wpoa_restore_default_settings_notice() {
 		$settings_link = "<a href='options-general.php?page=WP-OAuth.php'>Settings Page</a>"; // CASE SeNsItIvE filename!
@@ -234,7 +235,7 @@ function init() {
 			add_filter('login_footer', array($this, 'wpoa_push_login_messages'));
 		}
 	}
-	
+
 	// init scripts and styles for use on FRONTEND PAGES:
 	function wpoa_init_frontend_scripts_styles() {
 		// here we "localize" php variables, making them available as a js variable in the browser:
@@ -260,7 +261,7 @@ function wpoa_init_frontend_scripts_styles() {
 		wp_enqueue_script('wpoa-script', plugin_dir_url( __FILE__ ) . 'wp-oauth.js', array());
 		wp_enqueue_style('wpoa-style', plugin_dir_url( __FILE__ ) . 'wp-oauth.css', array());
 	}
-	
+
 	// init scripts and styles for use on BACKEND PAGES:
 	function wpoa_init_backend_scripts_styles() {
 		// here we "localize" php variables, making them available as a js variable in the browser:
@@ -287,7 +288,7 @@ function wpoa_init_backend_scripts_styles() {
 		// load the default wordpress media screen:
 		wp_enqueue_media();
 	}
-	
+
 	// init scripts and styles for use on the LOGIN PAGE:
 	function wpoa_init_login_scripts_styles() {
 		// here we "localize" php variables, making them available as a js variable in the browser:
@@ -316,25 +317,25 @@ function wpoa_init_login_scripts_styles() {
 		wp_enqueue_script('wpoa-script', plugin_dir_url( __FILE__ ) . 'wp-oauth.js', array());
 		wp_enqueue_style('wpoa-style', plugin_dir_url( __FILE__ ) . 'wp-oauth.css', array());
 	}
-	
+
 	// add a settings link to the plugins page:
 	function wpoa_settings_link($links) {
 		$settings_link = "<a href='options-general.php?page=WP-OAuth.php'>Settings</a>"; // CASE SeNsItIvE filename!
-		array_unshift($links, $settings_link); 
-		return $links; 
+		array_unshift($links, $settings_link);
+		return $links;
 	}
-	
+
 	// ===============
 	// GENERIC HELPERS
 	// ===============
-	
+
 	// adds basic http auth to a given url string:
 	function wpoa_add_basic_auth($url, $username, $password) {
 		$url = str_replace("https://", "", $url);
 		$url = "https://" . $username . ":" . $password . "@" . $url;
 		return $url;
 	}
-	
+
 	// ===================
 	// LOGIN FLOW HANDLING
 	// ===================
@@ -347,7 +348,7 @@ function wpoa_qvar_triggers($vars) {
 		$vars[] = 'error_message';
 		return $vars;
 	}
-	
+
 	// handle the querystring triggers:
 	function wpoa_qvar_handlers() {
 		if (get_query_var('connect')) {
@@ -363,7 +364,7 @@ function wpoa_qvar_handlers() {
 			$this->wpoa_include_connector($provider);
 		}
 	}
-	
+
 	// load the provider script that is being requested by the user or being called back after authentication:
 	function wpoa_include_connector($provider) {
 		// normalize the provider name (no caps, no spaces):
@@ -373,7 +374,7 @@ function wpoa_include_connector($provider) {
 		// include the provider script:
 		include 'login-' . $provider . '.php';
 	}
-	
+
 	// =======================
 	// LOGIN / LOGOUT HANDLING
 	// =======================
@@ -389,11 +390,17 @@ function wpoa_match_wordpress_user($oauth_identity) {
 		$user = get_user_by('id', $query_result);
 		return $user;
 	}
-	
+
 	// login (or register and login) a wordpress user based on their oauth identity:
 	function wpoa_login_user($oauth_identity) {
 		// store the user info in the user session so we can grab it later if we need to register the user:
 		$_SESSION["WPOA"]["USER_ID"] = $oauth_identity["id"];
+		// Get bonus data from OAuth if we have it
+		if(isset($oauth_identity['oa_login'])) $_SESSION['WPOA']['OA_USERNAME'] = $oauth_identity['oa_login'];
+		if(isset($oauth_identity['oa_email'])) $_SESSION['WPOA']['OA_EMAIL'] = $oauth_identity['oa_email'];
+		if(isset($oauth_identity['oa_nicename'])) $_SESSION['WPOA']['OA_NICENAME'] = $oauth_identity['oa_nicename'];
+		if(isset($oauth_identity['oa_desc'])) $_SESSION['WPOA']['OA_DESC'] = $oauth_identity['oa_desc'];
+		if(isset($oauth_identity['oa_url'])) $_SESSION['WPOA']['OA_URL'] = $oauth_identity['oa_url'];
 		// try to find a matching wordpress user for the now-authenticated user's oauth identity:
 		$matched_user = $this->wpoa_match_wordpress_user($oauth_identity);
 		// handle the matched user if there is one:
@@ -425,7 +432,7 @@ function wpoa_login_user($oauth_identity) {
 		// we shouldn't be here, but just in case...
 		$this->wpoa_end_login("Sorry, we couldn't log you in. The login flow terminated in an unexpected way. Please notify the admin or try again later.");
 	}
-	
+
 	// ends the login request by clearing the login state and redirecting the user to the desired page:
 	function wpoa_end_login($msg) {
 		$last_url = $_SESSION["WPOA"]["LAST_URL"];
@@ -458,7 +465,7 @@ function wpoa_end_login($msg) {
 		wp_safe_redirect($redirect_url);
 		die();
 	}
-	
+
 	// logout the wordpress user:
 	// TODO: this is usually called from a custom logout button, but we could have the button call /wp-logout.php?action=logout for more consistency...
 	function wpoa_logout_user() {
@@ -467,7 +474,7 @@ function wpoa_logout_user() {
 		session_destroy(); 	// destroy the php user session
 		wp_logout(); 		// logout the wordpress user...this gets hooked and diverted to wpoa_end_logout() for final handling
 	}
-	
+
 	// ends the logout request by redirecting the user to the desired page:
 	function wpoa_end_logout() {
 		$_SESSION["WPOA"]["RESULT"] = 'Logged out successfully.';
@@ -509,7 +516,7 @@ function wpoa_end_logout() {
 		wp_safe_redirect($redirect_url);
 		die();
 	}
-	
+
 	// links a third-party account to an existing wordpress user account:
 	function wpoa_link_account($user_id) {
 		if ($_SESSION['WPOA']['USER_ID'] != '') {
@@ -540,14 +547,14 @@ function wpoa_unlink_account() {
 		// wp-ajax requires death:
 		die();
 	}
-	
+
 	// pushes login messages into the dom where they can be extracted by javascript:
 	function wpoa_push_login_messages() {
 		$result = $_SESSION['WPOA']['RESULT'];
 		$_SESSION['WPOA']['RESULT'] = '';
 		echo "<div id='wpoa-result'>" . $result . "</div>";
 	}
-	
+
 	// clears the login state:
 	function wpoa_clear_login_state() {
 		unset($_SESSION["WPOA"]["USER_ID"]);
@@ -557,7 +564,7 @@ function wpoa_clear_login_state() {
 		unset($_SESSION["WPOA"]["EXPIRES_AT"]);
 		//unset($_SESSION["WPOA"]["LAST_URL"]);
 	}
-	
+
 	// ===================================
 	// DEFAULT LOGIN SCREEN CUSTOMIZATIONS
 	// ===================================
@@ -566,7 +573,7 @@ function wpoa_clear_login_state() {
 	function wpoa_logo_link() {
 		return get_bloginfo('url');
 	}
-	
+
 	// show a custom login form on the default login screen:
 	function wpoa_customize_login_screen() {
 		$html = "";
@@ -581,7 +588,7 @@ function wpoa_customize_login_screen() {
 	// ===================================
 	// DEFAULT COMMENT FORM CUSTOMIZATIONS
 	// ===================================
-	
+
 	// show a custom login form at the top of the default comment form:
 	function wpoa_customize_comment_form_fields($fields) {
 		$html = "";
@@ -593,7 +600,7 @@ function wpoa_customize_comment_form_fields($fields) {
 		}
 		return $fields;
 	}
-	
+
 	// show a custom login form at the top of the default comment form:
 	function wpoa_customize_comment_form() {
 		$html = "";
@@ -608,7 +615,7 @@ function wpoa_customize_comment_form() {
 	// =========================
 	// LOGIN / LOGOUT COMPONENTS
 	// =========================
-	
+
 	// shortcode which allows adding the wpoa login form to any post or page:
 	function wpoa_login_form( $atts ){
 		$a = shortcode_atts( array(
@@ -633,7 +640,7 @@ function wpoa_login_form( $atts ){
 		$html = $this->wpoa_login_form_content($a['design'], $a['icon_set'], $a['layout'], $a['button_prefix'], $a['align'], $a['show_login'], $a['show_logout'], $a['logged_out_title'], $a['logged_in_title'], $a['logging_in_title'], $a['logging_out_title'], $a['style'], $a['class']);
 		return $html;
 	}
-	
+
 	// gets the content to be used for displaying the login/logout form:
 	function wpoa_login_form_content($design = '', $icon_set = 'icon_set', $layout = 'links-column', $button_prefix = '', $align = 'left', $show_login = 'conditional', $show_logout = 'conditional', $logged_out_title = 'Please login:', $logged_in_title = 'You are already logged in.', $logging_in_title = 'Logging in...', $logging_out_title = 'Logging out...', $style = '', $class = '') { // even though wpoa_login_form() will pass a default, we might call this function from another method so it's important to re-specify the default values
 		// if a design was specified and that design exists, load the shortcode attributes from that design:
@@ -682,7 +689,7 @@ function wpoa_login_form_content($design = '', $icon_set = 'icon_set', $layout =
 		$html .= "</div>";
 		return $html;
 	}
-	
+
 	// generate and return the login buttons, depending on available providers:
 	function wpoa_login_buttons($icon_set, $button_prefix) {
 		// generate the atts once (cache them), so we can use it for all buttons without computing them each time:
@@ -729,7 +736,7 @@ function wpoa_login_button($provider, $display_name, $atts) {
 		}
 		return $html;
 	}
-	
+
 	// output the custom login form design selector:
 	function wpoa_login_form_designs_selector($id = '', $master = false) {
 		$html = "";
@@ -753,7 +760,7 @@ function wpoa_login_form_designs_selector($id = '', $master = false) {
 		}
 		return $html;
 	}
-	
+
 	// returns a saved login form design as a shortcode atts string or array for direct use via the shortcode
 	function wpoa_get_login_form_design($design_name, $as_string = false) {
 		$designs_json = get_option('wpoa_login_form_designs');
@@ -776,7 +783,7 @@ function wpoa_get_login_form_design($design_name, $as_string = false) {
 		}
 		return $atts;
 	}
-	
+
 	function wpoa_login_form_design_exists($design_name) {
 		$designs_json = get_option('wpoa_login_form_designs');
 		$designs_array = json_decode($designs_json, true);
@@ -793,7 +800,7 @@ function wpoa_login_form_design_exists($design_name) {
 			return false;
 		}
 	}
-	
+
 	// shows the user's linked providers, used on the 'Your Profile' page:
 	function wpoa_linked_accounts() {
 		// get the current user:
@@ -841,18 +848,18 @@ function wpoa_linked_accounts() {
 		echo "</td>";
 		echo "</table>";
 	}
-	
+
 	// ====================
 	// PLUGIN SETTINGS PAGE
 	// ====================
-	
+
 	// registers all settings that have been defined at the top of the plugin:
 	function wpoa_register_settings() {
 		foreach ($this->settings as $setting_name => $default_value) {
 			register_setting('wpoa_settings', $setting_name);
 		}
 	}
-	
+
 	// add the main settings page:
 	function wpoa_settings_page() {
 		add_options_page( 'WP-OAuth Options', 'WP-OAuth', 'manage_options', 'WP-OAuth', array($this, 'wpoa_settings_page_content') );
@@ -870,4 +877,4 @@ function wpoa_settings_page_content() {
 
 // instantiate the plugin class ONCE and maintain a single instance (singleton):
 WPOA::get_instance();
-?>
\ No newline at end of file
+?>