fixing logout problem and issue with removing the iconid