Added Defer Button and fixed login crash issue