fixed re-routing after login and string concat problem

Change-Id: I4ffb50214213d7cdbca8a2a7f9107215aee1283a