Make password waiter work