Fixed temporary client and made server secure