Split gen_mac, restructure login