Added crypt service, corrected behaviour