Fixed issue #287 of login.webmaker.org at Github