Login and Client fixed (views)