diff --git a/AppKit/CPSecureTextField.j b/AppKit/CPSecureTextField.j
index cca7e0da1..5c7602ef9 100644
--- a/AppKit/CPSecureTextField.j
+++ b/AppKit/CPSecureTextField.j
@@ -1,6 +1,6 @@
+
 @import "CPTextField.j"
 
-#include "Platform/Platform.h"
 
 @implementation CPSecureTextField : CPTextField
 {
diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 430762de0..bcaf0f6d6 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -774,6 +774,10 @@ CPTextFieldStatePlaceholder = 1 << 13;
 
 var secureStringForString = function(aString)
 {
+    // This is true for when aString === "" and null/undefined.
+    if (!aString)
+        return "";
+
     var secureString = "",
         length = aString.length;
 
diff --git a/Tools/nib2cib/NSAppKit.j b/Tools/nib2cib/NSAppKit.j
index a0e6de2e7..d3cd2da45 100644
--- a/Tools/nib2cib/NSAppKit.j
+++ b/Tools/nib2cib/NSAppKit.j
@@ -40,6 +40,7 @@
 @import "NSScrollView.j"
 @import "NSScroller.j"
 @import "NSSet.j"
+@import "NSSecureTextField.j"
 @import "NSSegmentedControl.j"
 @import "NSSlider.j"
 @import "NSSplitView.j"
diff --git a/Tools/nib2cib/NSSecureTextField.j b/Tools/nib2cib/NSSecureTextField.j
new file mode 100644
index 000000000..74d6c68a5
--- /dev/null
+++ b/Tools/nib2cib/NSSecureTextField.j
@@ -0,0 +1,26 @@
+
+@import <AppKit/CPSecureTextField.j>
+
+@import "NSTextField.j"
+
+
+@implementation NSSecureTextField : CPSecureTextField
+{
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [self NS_initWithCoder:aCoder];
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPSecureTextField class];
+}
+
+@end
+
+@implementation NSSecureTextFieldCell : NSTextFieldCell
+{
+}
+@end