fixing bug when logged out
merging