diff --git a/mod/settings.php b/mod/settings.php
index 6eaa17ad0c..b10f9e3fc0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -111,7 +111,9 @@ function settings_post(&$a) {
 
 	$openidserver = $a->user['openidserver'];
 
-	if($openid != $a->user['openid']) {
+	// If openid has changed or if there's an openid but no openidserver, try and discover it.
+
+	if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
 		logger('updating openidserver');
 		require_once('library/openid.php');
 		$open_id_obj = new LightOpenID;