[Users] Improving TLS implementation