Merged in 280..288 from upstream (e.g. PING)

1 files changed, 6 insertions, 1 deletions

diff --git a/account.c b/account.c
index 388d04d0..4eb78faa 100644
--- a/account.c
+++ b/account.c
@@ -94,10 +94,15 @@ char *set_eval_account( set_t *set, char *value )
 	{
 		g_free( acc->server );
 		if( *value )
+		{
 			acc->server = g_strdup( value );
+			return value;
+		}
 		else
+		{
 			acc->server = NULL;
-		return value;
+			return g_strdup( set->def );
+		}
 	}
 	else if( strcmp( set->key, "auto_connect" ) == 0 )
 	{