added disabled account condition