fix account and friend stuff