Handle admin u/p initialization better