Fixed bug when timestamps have not been added
Fixed wrong redirect on logout