diff --git a/src/model/account.c b/src/model/account.c
index 5298f7f..294721e 100644
--- a/src/model/account.c
+++ b/src/model/account.c
@@ -250,6 +250,9 @@ static struct account* account_load_from_id( int id, int recurse_limit )
 	if( !a->banner ) {
 		a->banner = aformat( "https://%s/server/default-banner.blob", g_server->domain );
 	}
+	if( !a->account_id ) {
+		a->account_id = strdup(a->account_url);
+	}
 
 	if( a->id == owner_account_id ) {
 		a->local = true;