Arg passing at login fixed