Fixed login procedure which changed on 22-08-2014. This closes #7