diff --git a/3party/3party.pro b/3party/3party.pro
index 42c047e06f..e58611705e 100644
--- a/3party/3party.pro
+++ b/3party/3party.pro
@@ -2,7 +2,7 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf
+SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf tomcrypt
 
 !iphonesimulator-g++42 {
   !iphonedevice-g++42 {
diff --git a/3party/tomcrypt/src/headers/tomcrypt_cfg.h b/3party/tomcrypt/src/headers/tomcrypt_cfg.h
index 7feae6e8bd..83666d1595 100644
--- a/3party/tomcrypt/src/headers/tomcrypt_cfg.h
+++ b/3party/tomcrypt/src/headers/tomcrypt_cfg.h
@@ -45,7 +45,7 @@ LTC_EXPORT int   LTC_CALL XSTRCMP(const char *s1, const char *s2);
 
 /* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */
 #ifndef ARGTYPE
-   #define ARGTYPE  0
+   #define ARGTYPE  4
 #endif
 
 /* Controls endianess and size of registers.  Leave uncommented to get platform neutral [slower] code 
diff --git a/3party/tomcrypt/tomcrypt.pro b/3party/tomcrypt/tomcrypt.pro
new file mode 100644
index 0000000000..eee3c3c9cb
--- /dev/null
+++ b/3party/tomcrypt/tomcrypt.pro
@@ -0,0 +1,17 @@
+TARGET = tomcrypt
+ROOT_DIR = ../..
+include($$ROOT_DIR/common.pri)
+
+INCLUDEPATH += src/headers
+
+TEMPLATE = lib
+CONFIG += staticlib
+
+DEFINES += LTC_NO_ROLC
+
+SOURCES += \
+    src/hashes/sha2/sha256.c \
+    src/hashes/sha1.c \
+
+HEADERS += \
+    src/headers/tomcrypt.h \
diff --git a/platform/platform.pro b/platform/platform.pro
index 95b32f9458..775dd21d35 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -5,10 +5,12 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = base version
+DEPENDENCIES = base tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
+INCLUDEPATH += ../3party/tomcrypt/src/headers
+
 QT *= core network
 
 SOURCES += \
diff --git a/platform/platform_tests/platform_tests.pro b/platform/platform_tests/platform_tests.pro
index 54baf02656..5e68170e64 100644
--- a/platform/platform_tests/platform_tests.pro
+++ b/platform/platform_tests/platform_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = platform coding base
+DEPENDENCIES = platform coding base tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/platform/qt_download.cpp b/platform/qt_download.cpp
index cd39431682..99a3f6b7f3 100644
--- a/platform/qt_download.cpp
+++ b/platform/qt_download.cpp
@@ -4,12 +4,10 @@
 #include "../base/logging.hpp"
 #include "../base/assert.hpp"
 
-#include "../coding/bit_shift.hpp"
-
-#include "../version/version.hpp"
-
 #include "../std/target_os.hpp"
 
+#include <tomcrypt.h>
+
 #include <QNetworkInterface>
 #include <QFSFileEngine>
 #include <QDateTime>
@@ -33,11 +31,7 @@ static QString MacAddress()
       && hwAddr.size() == 17) // mac length with semicolons
     {
       hwAddr.remove(':');
-      bool success = false;
-      qulonglong numAddr = hwAddr.toULongLong(&success, 16);
-      numAddr = bits::ror(numAddr, 11);
-      if (success)
-        return QString("%1").arg(numAddr);
+      return hwAddr;
     }
   }
   // no valid interface was found
@@ -67,13 +61,24 @@ static QString UniqueClientId()
     if (result.size() == 0)
       result = QString("------------");
   }
+  // calculate one-way hash
+  QByteArray const original = QByteArray::fromHex(result.toLocal8Bit());
+  unsigned char out[100] = { 0 };
+  hash_state md;
+  if (CRYPT_OK == sha1_init(&md)
+      && CRYPT_OK == sha1_process(&md, reinterpret_cast<unsigned char const *>(original.constData()),
+                                  original.size())
+      && CRYPT_OK == sha1_done(&md, out))
+  {
+    return QByteArray(reinterpret_cast<char const *>(out)).toHex();
+  }
+  // if encryption failed, do not encrypt data
   return result;
 }
 
 static QString UserAgent()
 {
-  static QString userAgent = QString("MWM(" OMIM_OS_NAME ")/") + QString(VERSION_STRING)
-                             + QString("/") + UniqueClientId();
+  static QString userAgent = UniqueClientId();
   return userAgent;
 }
 
diff --git a/qt/qt.pro b/qt/qt.pro
index adee9dd220..b2426342fa 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -1,6 +1,6 @@
 # Main application in qt.
 ROOT_DIR = ..
-DEPENDENCIES = map storage indexer yg platform geometry coding base freetype expat fribidi version
+DEPENDENCIES = map storage indexer yg platform geometry coding base freetype expat fribidi tomcrypt version
 
 include($$ROOT_DIR/common.pri)