ARMS-198 #Done Remove username login