1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 3933a22..0159a79 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -229,47 +229,47 @@ void DataManager :: writeOutIpkgConf()
         out << "dest " << it2->getDestinationName() << " " << it2->getDestinationPath() << endl;
         it2++;
     }
 
     out << endl;
     out << "# Proxy Support" << endl;
 
     if ( !httpProxyEnabled && httpProxy == "" )
         out << "#option http_proxy http://proxy.tld:3128" << endl;
     else
     {
         if ( !httpProxyEnabled )
             out << "#";
         out << "option http_proxy " << httpProxy << endl;
     }
 
     if ( !ftpProxyEnabled && ftpProxy == "" )
         out << "#option ftp_proxy http://proxy.tld:3128" << endl;
     else
     {
         if ( !ftpProxyEnabled )
             out << "#";
         out << "option ftp_proxy " << ftpProxy << endl;
     }
-    if ( proxyUsername == "" )
+    if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
         out << "#option proxy_username <username>" << endl;
     else
         out << "option proxy_username " << proxyUsername << endl;
-    if ( proxyPassword == "" )
+    if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
         out << "#option proxy_password <password>" << endl << endl;
     else
         out << "option proxy_password " << proxyPassword << endl<< endl;
 
     out << "# Offline mode (for use in constructing flash images offline)" << endl;
     out << "#option offline_root target" << endl;
 
     
     out.close();
 }
 
 
 void DataManager :: setAvailableCategories( QString section )
 {
     section = section.lower();
     if ( availableCategories.find( "#" + section + "#" ) == -1 )
         availableCategories += section + "#";
 }