GUI-897

removed erroneous expired message. fixed logout and test to use id for link