Security improved, registration added