Removed ChatEntity and fixed password protection