Add Simple non encrypted login, cleaned up some other things