quick fix to mpauth and removed some code from make_mobile copying, needs to be redone properly later