Working on Signin and user restriction on managetips
fixed merge issues