fixes for http://relevance.lighthouseapp.com/projects/18757-castronaut/tickets/7-callbacks-block-login-process#ticket-7-2
fixes for http://relevance.lighthouseapp.com/projects/18757-castronaut/tickets/7-callbacks-block-login-process#ticket-7-2

relevance/castronaut,relevance/castronaut,nbudin/castronaut,nbudin/castronaut