diff --git a/lib/main.dart b/lib/main.dart
index 8f5312ddf50d6bc781cd7a9c27a108cf9e233630..3565a3f7509ade22c6652eff78533f7939b0eee4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,7 +15,6 @@ import 'package:provider/provider.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import "package:system_info/system_info.dart";
 
 final bool enableSentry = true;
 
@@ -30,8 +29,6 @@ Future<void> main() async {
   await _homeProvider.createDefaultAvatar();
   appVersion = await _homeProvider.getAppVersion();
   prefs = await SharedPreferences.getInstance();
-  ramSys = SysInfo.getTotalPhysicalMemory() ~/ 800000;
-  print("Votre appareil fait $ramSys de RAM.");
   final HiveStore _store =
       await HiveStore.open(path: '${appPath.path}/gqlCache');
 
diff --git a/lib/models/walletOptions.dart b/lib/models/walletOptions.dart
index cde9a4478cc0eb4b7d758912385a2a6b7732aeae..afe716e49f4bac9a13227f614fa5ccfb19e85537 100644
--- a/lib/models/walletOptions.dart
+++ b/lib/models/walletOptions.dart
@@ -75,6 +75,16 @@ class WalletOptionsProvider with ChangeNotifier {
     }
   }
 
+  int getPinLenght(_name) {
+    File _walletFile = File('${walletsDirectory.path}/$_name/wallet.dewif');
+    String _localDewif = _walletFile.readAsStringSync();
+
+    final int _pinLenght = DubpRust.getDewifSecretCodeLen(
+        dewif: _localDewif, secretCodeType: SecretCodeType.letters);
+
+    return _pinLenght;
+  }
+
   Future _renameWallet(_walletName, _newName) async {
     final _walletFile = Directory('${walletsDirectory.path}/$_walletName');
 
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index caa9478da62894b0d34c19d3b6fd7e29d3b845d7..8ff63200914980979ddce4f8b1769ebcb434046c 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:dubp/dubp.dart';
-import 'package:gecko/globals.dart';
 import 'package:gecko/models/myWallets.dart';
 import 'package:gecko/models/walletOptions.dart';
 import 'package:gecko/screens/myWallets/changePin.dart';
@@ -22,7 +21,6 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
   bool hasError = false;
   var pinColor = Color(0xffF9F9F1);
   var walletPin = '';
-  int _pinLenght;
 
   Future<NewWallet> get badWallet => null;
 
@@ -35,11 +33,8 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
         Provider.of<MyWalletsProvider>(context);
     errorController = StreamController<ErrorAnimationType>();
     // _walletOptions.isWalletUnlock = false;
-    if (ramSys <= 3000) {
-      _pinLenght = 6;
-    } else {
-      _pinLenght = 5;
-    }
+
+    final int _pinLenght = _walletOptions.getPinLenght(this.walletName);
 
     return WillPopScope(
         onWillPop: () {