not finished yet
fix login problems