fixed editing
fixes #1 and #2 - accounts disabled for now