diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index f18a6224..9200a5f7 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -262,7 +262,7 @@ open class InputField: EntryFieldBase {
         var minWidth: CGFloat = 40.0
         var leftIconName: Icon.Name?
         var actionModel: InputField.TextLinkModel?
-        var toolTipModel: Tooltip.TooltipModel?
+        var toolTipModel: Tooltip.TooltipModel? = tooltipModel
         var isSecureTextEntry = false
 
         switch fieldType {
@@ -277,7 +277,10 @@ open class InputField: EntryFieldBase {
             
         case .password:
             let isHide = passwordActionType == .hide
-            let buttonText =  isHide ? hidePasswordButtonText : showPasswordButtonText
+            let buttonText =  isHide ?
+            hidePasswordButtonText.isEmpty ? "Hide" : hidePasswordButtonText :
+            showPasswordButtonText.isEmpty ? "Show" : showPasswordButtonText
+            
             isSecureTextEntry = !isHide
             let nextPasswordActionType = passwordActionType.toggle()
             if let text, !text.isEmpty {