Started work on retaining username session