Fixed issues with accounts not working