added proper separate user functionality