Bug Fixed error in service that resulted in null pointer exception.
Added functionality to login where by on incroect login username field remains.