diff --git a/background.js b/background.js
index 73ccbf7..06754e0 100644
--- a/background.js
+++ b/background.js
@@ -1,6 +1,7 @@
 chrome.runtime.onInstalled.addListener(function() {
 	chrome.contextMenus.create({ "id": "copy_form", "title": "Copy Form", "contexts": ["editable"] });
 	chrome.contextMenus.create({ "id": "paste_form", "title": "Paste Form", "contexts": ["editable"], enabled: false });
+	chrome.contextMenus.create({ "id": "paste_form2", "title": "Paste Form (with Hidden)", "contexts": ["editable"], enabled: false });
 });
 
 chrome.contextMenus.onClicked.addListener(function(msg, tab) {
@@ -9,7 +10,10 @@ chrome.contextMenus.onClicked.addListener(function(msg, tab) {
 			copyFormContextMenu(tab);
 			break;
 		case "paste_form":
-			pastFormContextMenu(tab);
+			pasteFormContextMenu(tab, false);
+			break;
+		case "paste_form2":
+			pasteFormContextMenu(tab, true);
 			break;
 		default: break;
 	}
@@ -30,11 +34,11 @@ function copyFormContextMenu(tab) {
 	});
 }
 
-function pastFormContextMenu(tab) {
+function pasteFormContextMenu(tab, includeHiddenEl) {
 	chrome.storage.local.get('clipboard', function(response) {
 		try {
 			let msgData = JSON.parse(response.clipboard);
-			msgData.action = "paste";
+			msgData.action = (includeHiddenEl === true ? "paste2" : "paste");
 
 			chrome.tabs.sendMessage(tab.id, msgData);
 		} catch (err) {
diff --git a/content.js b/content.js
index 55662a7..3e9b97c 100644
--- a/content.js
+++ b/content.js
@@ -1,14 +1,13 @@
 chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
-
-	const parentForm = getParentFormNode(document.activeElement);
-	if (parentForm == null) {
-		console.log("Form not found");
+	let formContainer = getContainer(document.activeElement);
+	if (formContainer == null) {
+		writeLog("Form container not found");
 		return;
 	}
 
 	switch (request.action) {
 		case "copy":
-			const result = buildFormValueSet(parentForm, "input", "select", "textarea");
+			const result = getFormElementValueSet(formContainer, "input", "select", "textarea");
 
 			console.log(result);
 
@@ -16,30 +15,31 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 
 			break;
 		case "paste":
-			delete request.pasteForm;
+		case "paste2":
+			const includeHidden = (request.action == "paste2");
 
-			// console.log(request);
+			delete request.action;
 
 			for (let key in request) {
 				if (String.isNullOrWhitespace(key)) {
 					continue;
 				}
 
-				const dataType = checkDataType(request[key]);
+				const dataType = Object.getDataType(request[key]);
 				if (dataType == "object") {
 					continue;
 				}
 
-				const foundElements = parentForm.querySelectorAll("[name='" + key + "']");
-				if (foundElements.length <= 0) {
+				const foundEls = formContainer.querySelectorAll("[name='" + key + "']");
+				if (foundEls.length <= 0) {
 					continue;
 				}
 
 				if (dataType == "array") {
-					setFormElementValues(foundElements, request[key]);
+					setFormElementValues(foundEls, request[key], includeHidden);
 				} else {
-					for (let x=0; x<foundElements.length; x++) {
-						setFormElementValue(foundElements[x], request[key]);
+					for (let x=0; x<foundEls.length; x++) {
+						setFormElementValue(foundEls[x], request[key], includeHidden);
 					}
 				}
 			}
@@ -54,22 +54,27 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 
 
 /**
- * Check the data type of the value (string, number, array, object).
+ * Get node container.
  */
-function checkDataType(value) {
-	if (String.isNullOrUndefined(value)) {
-		return "null";
-	}
+function getContainer(node) {
+	let result = node;
 
-	if (typeof(value) == "object") {
-		if (Array.isArray(value)) {
-			return "array";
+	if (result.nodeName.toLocaleLowerCase() == "iframe") {
+		writeLog("iFrame found");
+
+		result = getIFrameFormNode(document.activeElement);
+	} else {
+		result = getParentFormNode(document.activeElement);
+		if (result == null) {
+			writeLog("No form found");
+
+			result = node.parentNode;
 		} else {
-			return "object";
+			writeLog("Form found");
 		}
 	}
 
-	return typeof(value);
+	return ((typeof(result) == "undefined") ? null : result);
 }
 
 /**
@@ -80,10 +85,7 @@ function getParentFormNode(node) {
 
 	// Special case, look inside iframe.
 	if (result.nodeName.toLocaleLowerCase() == "iframe") {
-		const foundForms = (result.contentDocument || result.contentWindow).getElementsByTagName("form");
-		if (foundForms.length > 0) {
-			return foundForms[0];
-		}
+		return null;
 	}
 
 	while (true) {
@@ -103,9 +105,25 @@ function getParentFormNode(node) {
 }
 
 /**
- * Push form element value to array.
+ * Get form node in iframe.
  */
-function buildFormValueSet(form, ...tagNames){
+function getIFrameFormNode(node) {
+	if (node.nodeName.toLocaleLowerCase() != "iframe") {
+		return null;
+	}
+
+	const foundEls = (node.contentDocument || node.contentWindow).getElementsByTagName("form");
+	if (foundEls.length <= 0) {
+		return null;
+	}
+
+	return foundEls[0];
+}
+
+/**
+ * Get form element values.
+ */
+function getFormElementValueSet(form, ...tagNames){
 	let result = { };
 
 	for (let x=0; x<tagNames.length; x++) {
@@ -116,15 +134,14 @@ function buildFormValueSet(form, ...tagNames){
 
 			switch (els[i].type)
 			{
-				case "hidden":
-					// Do nothing
-					break;
 				case "checkbox":
-					newValue = els[i].checked;
-					break;
 				case "radio":
 					newValue = els[i].checked;
 					break;
+				// case "hidden":
+				// 	continue;
+				case "submit":
+					continue;
 				default:
 					newValue = els[i].value;
 					break;
@@ -136,7 +153,7 @@ function buildFormValueSet(form, ...tagNames){
 
 			if (result[els[i].name]) {
 				// Convert single to array
-				if (checkDataType(result[els[i].name]) != "array") {
+				if (Object.getDataType(result[els[i].name]) != "array") {
 					result[els[i].name] = [result[els[i].name]];
 				}
 
@@ -153,14 +170,20 @@ function buildFormValueSet(form, ...tagNames){
 /**
  * Set single form element value.
  */
-function setFormElementValue(el, value) {
+function setFormElementValue(el, value, includeHidden) {
 	switch (el.type) {
 		case "hidden":
+			if (includeHidden === true) {
+				el.value = value;
+			}
+
 			break;
 		case "checkbox":
 		case "radio":
 			el.checked = value;
 			break;
+		case "submit":
+			break;
 		default:
 			el.value = value;
 			break;
@@ -170,12 +193,38 @@ function setFormElementValue(el, value) {
 /**
  * Set form element value from an array of values.
  */
-function setFormElementValues(els, values) {
+function setFormElementValues(els, values, includeHidden) {
 	for (let i=0; i<Math.min(els.length, values.length); i++) {
-		setFormElementValue(els[i], values[i]);
+		setFormElementValue(els[i], values[i], includeHidden);
 	}
 }
 
+/**
+ * Write log to console.
+ */
+function writeLog(message) {
+	console.log("Form Copypasta > " + message);
+}
+
+
+
+
+Object.getDataType = function(value) {
+	if (String.isNullOrUndefined(value)) {
+		return "null";
+	}
+
+	if (typeof(value) == "object") {
+		if (Array.isArray(value)) {
+			return "array";
+		} else {
+			return "object";
+		}
+	}
+
+	return typeof(value);
+};
+
 String.isNullOrUndefined = function(value) {
   if (typeof (value) == "undefined") {
     return true;
diff --git a/manifest.json b/manifest.json
index 06bc7e4..3feb213 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
    "manifest_version": 3,
    "name": "Form Copypasta",
    "description": "Copy and paste form element values. Not for distribution. Internal use only. Based on Copy Form (0.0.1.2) by Sam Larison.",
-   "version": "0.1.0.028",
+   "version": "0.1.0.035",
    "content_scripts": [
       {
          "js": [