Added save and logout