diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
index 297a83b59..c7be5807f 100644
--- a/src/base/net/stratum/DaemonClient.cpp
+++ b/src/base/net/stratum/DaemonClient.cpp
@@ -38,6 +38,7 @@
 #include "base/tools/Cvt.h"
 #include "base/tools/Timer.h"
 #include "base/tools/cryptonote/Signatures.h"
+#include "base/tools/cryptonote/WalletAddress.h"
 #include "net/JobResult.h"
 
 
@@ -305,13 +306,46 @@ bool xmrig::DaemonClient::parseJob(const rapidjson::Value &params, int *code)
             return false;
         }
 
+        uint8_t public_spendkey[32];
+        if (!secret_key_to_public_key(secret_spendkey, public_spendkey)) {
+            LOG_ERR("Secret spend key is invalid.");
+            *code = 7;
+            return false;
+        }
+
         uint8_t secret_viewkey[32];
         derive_view_secret_key(secret_spendkey, secret_viewkey);
 
+        uint8_t public_viewkey[32];
+        if (!secret_key_to_public_key(secret_viewkey, public_viewkey)) {
+            LOG_ERR("Secret view key is invalid.");
+            *code = 8;
+            return false;
+        }
+
         uint8_t derivation[32];
         if (!generate_key_derivation(m_blocktemplate.raw_blob.data() + m_blocktemplate.tx_pubkey_index, secret_viewkey, derivation)) {
             LOG_ERR("Failed to generate key derivation for miner signature.");
-            *code = 7;
+            *code = 9;
+            return false;
+        }
+
+        WalletAddress user_address;
+        if (!user_address.Decode(m_pool.user())) {
+            LOG_ERR("Invalid wallet address.");
+            *code = 10;
+            return false;
+        }
+
+        if (memcmp(user_address.public_spend_key, public_spendkey, sizeof(public_spendkey)) != 0) {
+            LOG_ERR("Wallet address and spend key don't match.");
+            *code = 11;
+            return false;
+        }
+
+        if (memcmp(user_address.public_view_key, public_viewkey, sizeof(public_viewkey)) != 0) {
+            LOG_ERR("Wallet address and view key don't match.");
+            *code = 12;
             return false;
         }
 
diff --git a/src/base/tools/cryptonote/Signatures.cpp b/src/base/tools/cryptonote/Signatures.cpp
index c058df1df..44d10f8f7 100644
--- a/src/base/tools/cryptonote/Signatures.cpp
+++ b/src/base/tools/cryptonote/Signatures.cpp
@@ -38,42 +38,12 @@ struct signature { ec_scalar c, r; };
 struct s_comm { hash h; ec_point key; ec_point comm; };
 
 
-static bool less32(const uint8_t* k0, const uint8_t* k1)
+static inline void random_scalar(ec_scalar& res)
 {
-    for (int n = 31; n >= 0; --n)
-    {
-        if (k0[n] < k1[n])
-            return true;
-        if (k0[n] > k1[n])
-            return false;
-    }
-    return false;
-}
-
-
-static void random32_unbiased(uint8_t* bytes)
-{
-    // l = 2^252 + 27742317777372353535851937790883648493.
-    // l fits 15 times in 32 bytes (iow, 15 l is the highest multiple of l that fits in 32 bytes)
-    static const uint8_t limit[32] = { 0xe3, 0x6a, 0x67, 0x72, 0x8b, 0xce, 0x13, 0x29, 0x8f, 0x30, 0x82, 0x8c, 0x0b, 0xa4, 0x10, 0x39, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0 };
-
-    for (;;) {
-        xmrig::Cvt::randomBytes(bytes, 32);
-        if (!less32(bytes, limit)) {
-            continue;
-        }
-        sc_reduce32(bytes);
-        if (sc_isnonzero(bytes)) {
-            break;
-        }
-    }
-}
-
-
-/* generate a random 32-byte (256-bit) integer and copy it to res */
-static void random_scalar(ec_scalar& res)
-{
-    random32_unbiased((uint8_t*) res.data);
+    // Don't care about bias or possible 0 after reduce: probability ~10^-76, not happening in this universe.
+    // Performance matters more. It's a miner after all.
+    xmrig::Cvt::randomBytes(res.data, sizeof(res.data));
+    sc_reduce32((uint8_t*) res.data);
 }
 
 
@@ -204,4 +174,28 @@ void derive_view_secret_key(const uint8_t* spend_secret_key, uint8_t* view_secre
 }
 
 
+void generate_keys(uint8_t* pub, uint8_t* sec)
+{
+    random_scalar(*((ec_scalar*)sec));
+
+    ge_p3 point;
+    ge_scalarmult_base(&point, sec);
+    ge_p3_tobytes(pub, &point);
+}
+
+
+bool secret_key_to_public_key(const uint8_t* sec, uint8_t* pub)
+{
+    if (sc_check(sec) != 0) {
+        return false;
+    }
+
+    ge_p3 point;
+    ge_scalarmult_base(&point, sec);
+    ge_p3_tobytes(pub, &point);
+
+    return true;
+}
+
+
 } /* namespace xmrig */
diff --git a/src/base/tools/cryptonote/Signatures.h b/src/base/tools/cryptonote/Signatures.h
index 0e2bea821..5fc966011 100644
--- a/src/base/tools/cryptonote/Signatures.h
+++ b/src/base/tools/cryptonote/Signatures.h
@@ -36,6 +36,9 @@ void derive_secret_key(const uint8_t* derivation, size_t output_index, const uin
 
 void derive_view_secret_key(const uint8_t* spend_secret_key, uint8_t* view_secret_key);
 
+void generate_keys(uint8_t* pub, uint8_t* sec);
+bool secret_key_to_public_key(const uint8_t* sec, uint8_t* pub);
+
 } /* namespace xmrig */