Hacky fix for BSD signup bug